Refactor Classes into Enums
Refactor Classes into Enum