C++11 improvement
cppcheck