[TASK] Code cleanup
[TASK] Wrap back links in paragraphs
[TASK] Add controller argument
[TASK] Remove superfluous properties
[TASK] Fix indentation
Merge pull request #1 from bjo3rnf/cleanup

[TASK] Code cleanup and fixes in coding guidelines