Interface code restructuring