removed unused methods, switch to enum class, moved enums to separate .h file
refactorings