small refactoring #1