PLA-1487 refactoring of code