#36 small refactoring