6ac40b3 Tidying