cosmetic changes + code formatting using the latest version of clang-format.