refactored some constants