Tidy up constants