Fix CPP formatting