LOADUI-585, post-code-review refactoring