diff --git a/swf/src/avm2/opcode.rs b/swf/src/avm2/opcode.rs
index 6fd88e284..4c061db59 100644
--- a/swf/src/avm2/opcode.rs
+++ b/swf/src/avm2/opcode.rs
@@ -25,11 +25,11 @@ pub enum OpCode {
     ConstructProp = 0x4a,
     ConstructSuper = 0x49,
     ConvertB = 0x76,
-    ConvertI = 0x73,
     ConvertD = 0x75,
+    ConvertI = 0x73,
     ConvertO = 0x77,
-    ConvertU = 0x74,
     ConvertS = 0x70,
+    ConvertU = 0x74,
     Debug = 0xef,
     DebugFile = 0xf1,
     DebugLine = 0xf0,
@@ -70,11 +70,11 @@ pub enum OpCode {
     IfGt = 0x17,
     IfLe = 0x16,
     IfLt = 0x15,
+    IfNe = 0x14,
     IfNge = 0x0f,
     IfNgt = 0x0e,
     IfNle = 0x0d,
     IfNlt = 0x0c,
-    IfNe = 0x14,
     IfStrictEq = 0x19,
     IfStrictNe = 0x1a,
     IfTrue = 0x11,
@@ -133,12 +133,12 @@ pub enum OpCode {
     ReturnValue = 0x48,
     ReturnVoid = 0x47,
     RShift = 0xa6,
+    SetGlobalSlot = 0x6f,
     SetLocal = 0x63,
     SetLocal0 = 0xd4,
     SetLocal1 = 0xd5,
     SetLocal2 = 0xd6,
     SetLocal3 = 0xd7,
-    SetGlobalSlot = 0x6f,
     SetProperty = 0x61,
     SetSlot = 0x6d,
     SetSuper = 0x05,
diff --git a/swf/src/avm2/types.rs b/swf/src/avm2/types.rs
index 0b3c47d51..58c07ad9b 100644
--- a/swf/src/avm2/types.rs
+++ b/swf/src/avm2/types.rs
@@ -384,6 +384,9 @@ pub enum Op {
     IfLt {
         offset: i32,
     },
+    IfNe {
+        offset: i32,
+    },
     IfNge {
         offset: i32,
     },
@@ -396,9 +399,6 @@ pub enum Op {
     IfNlt {
         offset: i32,
     },
-    IfNe {
-        offset: i32,
-    },
     IfStrictEq {
         offset: i32,
     },
@@ -502,10 +502,10 @@ pub enum Op {
     ReturnValue,
     ReturnVoid,
     RShift,
-    SetLocal {
+    SetGlobalSlot {
         index: u32,
     },
-    SetGlobalSlot {
+    SetLocal {
         index: u32,
     },
     SetProperty {