MORE C++11IZATION