slight tidy-up