Resolve "Cleanup"

Jonas Schwabrequested to merge
99-cleanup into master

Closes #99 (closed)

Edited by Fakher F. Assaad

Merge request reports