Tidy-up prefixes