Rename variables and add whitespace for clarity
Merge pull request #25 from macu/master

Rename variables and add whitespace for clarity