Cleaning up constants