Use std::string& message, fix some whitespace.