Initial C++11 refactoring
Use enum classes