Update formatting and revert to C++