Prettier comments :)
Reduce the number of inline comments
Forgot to rename the function
Rolling back one change, so I dont to mess around with conflicts
Merge pull request #482 from dapil/patch-3

Prettier comments :)