Made some comments more clear.  Used a std::move somewhere.