#7 small refactoring