Edits and taking about C++11