MANTA-17 c++ formatting update