Tidy up and standardise