Resolve "cppcheck reporting miscellaneous issues"

Closes #202 (closed)

Merge request reports