PEP8: Tidy up constants etc