Reorganized constant values