PLA-1066 small refactoring