Just a few tidy-ups