Apply changes suggested by clang-tidy