Slight tidy-up