KRACOEUS-7663: code review suggestions