KRACOEUS-7308: responding to some code review comments