Change constant values to "enums"
Encapsulate