Cleaned up some unnecessary code and put comments in for all methods.