refactoring
minor changes