refactoring
cleanup
more cleanup
more cleanup