Little bit of cleanup
Merge pull request #11 from imbrianj/master

Little bit of cleanup