small refactoring
minor changes