LOADUI-1074 Implemented code review suggestions