more tidy-up