minor cleanup
minor refactoring