#63 small refactoring