Tidying continued