CPP: C++11 and frugal with whitespace / clean up code.