LUN-600 -- refactorings