A little consistency and some C++11 features