LUN-600 -- refactoring