Refactored values into an enum