Quick cleanup :) Still kinda messy (and some of it is my mess) but my time's almost up!
Merge pull request #2 from m-mitchell/master

Quick cleanup :)