Updated C++ output style, added string support