clean up interface some more