Refactored some constants into an enum