Fix a few clang-tidy complaints

Arndt, Danielrequested to merge
github/fork/masterleinad/fix_clang_tidy_warning into master

Created by: masterleinad

Running clang-tidy really didn't yield much, but this still looks nicer.

Merge request reports