small refactoring.
small refactoring.