Update code order
Use syntax type for define