CHG: Refactoring, captializing enum constants