comments and cleanup
more cleanup