Merge pull request #1 from mcmtroffaes/master

Small cleanups.