Updating refactored initializer code to c++11