Refactored some constants