cleaned up some of the clean up code