LOADUI-1421 Cleanup after code review