Removed a bunch of unneeded comments, and re-grouped some code