#19 small refactoring