Cleanup: switched to C++11 member var initialization, cleaning up constructor init lists