tidy up and schema #28