ticket:57 small refactoring