c++ style
cleanups
c++ style
move enumerations into separate compilation unit