LOADUI-989 Minor refactoring and cleaning