Output Formatting in C++ - Squashed Commits

Ok, I'm pretty sure I correctly squashed my latest commits. Let me know if this is what you are looking for.