Time for my semi-random code cleanup commit.
Merge pull request #12 from Iaccidentally/master

Time for my semi-random code cleanup commit.