a few more changes suggested by clang-tidy

Merge request reports

Loading