Clean up constants for readability