minor refactoring
minor changes