Added first implementation of inline commenting. Initiated small
refactor.
Continued with the refactor.
Merge pull request #18 from mondora/APP-324

APP-324