Interface tidy-up