cleaning up some of the commented code and irrelevant stuff