reindenting
Comment on something confusing
Merge pull request #2 from Trevoke/master

Reindenting and a comment on something confusing