small refactoring.