small refactoring
small changes