Style tidy-ups