I cleaned up your code
Merge pull request #1 from zanderg/master

I cleaned up your code