reorganized constants