A little cleanup.
Merge pull request #1 from jonathanmarvens/master

A little cleanup.