Some tidy-ups