more refactoring
minor changes