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

Just some changes to reduce the line count and clean it up - thought I'd do the same to this as my parallel version for completeness.