Refactored some constants to use variables instead