Formatting + c++11ify