KRACOEUS-7012 refactors from pull request