Merge pull request #150 from Jedwondle/master

Cleaned up a few more things.