I cleaned the file up a bit
Merge pull request #25 from ecricci/master

I cleaned the file up a bit