Refactoring. (Constant values need to be made to enum values.)