Clean up code for better constants.