compiler - cpp_v2: some automagic style changes applied