Comments as refactoring hints and much reindenting
Merge pull request #2 from Trevoke/master

Thank you.