Moved values to constants