#67 small refactoring