Removed extra commented lines and cleaned up some junk