Added code base fixes after review

Merged Patrik Tomov requested to merge 24-fix-codebase-2 into master

Closes #24 (closed)

Merge request reports