cleaned up some of the commented code