Refactor: Replace enum with enum class
Refactor: Delete unused constants
Refactor: Replace macros with scoped enum
Refactor: Replace macros with enum class
Refactor: Replace macros with enum class