Tidy up interface