Tidy up interface definitions