Apply suggestions from code review Co-authored-by: Tim Bannister <tim@scalefactory.com> Co-authored-by: Dmitry Shurupov <dmitry.shurupov@palark.com>