LUN-1196 -- refactoring