a few tidy-ups