Code reduction and definition of tuple struct.
Definition of tuple struct fixed.