ticket:61 small refactoring