+ Enum classes

! small refactoring