clean up and commiting classes
more cleaning up