tweak white space, remove unneeded lines, change variable names, make DRY
Merge pull request #2 from dillonforrest/master

Second pull request