Dominic: clean up interface