Clean up variables
Whitespace
Quote consistency
Merge pull request #2 from scottjg/cleanup

Make things better