clang-tidy readability fixes

9 jobs for master in 2 minutes and 11 seconds (queued for 1 second)