Cleaning up the crazy amount of comments. Organizing.