#184 Review changes and C++11 switch