LOADUI-618 refactored everything relevant to become more readable