Make use of some C++11 features. Some small code improvements.