Refactored some comments, took out a couple main methods