small refactoring..
small refactors