did some tidy-up