Patched whitespace and move initialization around.
Switch C++ standard (back) to C++11.