Code cleanup

Sander Rijnrequested to merge
code-cleanup into elastic-demand

Some further cleanup of the code:

  • shortening/removing comments
  • inlining some statements

Merge request reports