Cleaned up comments, made code look pretty
Assisted by Chris Dunkers and Lauren Kahn