LUN-600 -- small refactoring