Incremental interface tidyup