tidy up interface