Cleaned up some of the comments and deleted old unecessary code.