changed some defines to consts