converted some constants to enums