Some tidying done