Clean-up constants.py