Some cleaning and added docblocks.
Merge pull request #215 from pvankouteren/no-issue-low-hanging-fruits

Some cleaning and added docblocks.