Consolidated some constants