Just some tidying