Some tidy-up