small refactoring...