Add some data tidying