diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs
index 7068306a98..7dc2dbd414 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Ryujinx.Graphics.Shader.Instructions;
 
 namespace Ryujinx.Graphics.Shader.Decoders
 {
-    class OpCodeDepbar
+    class OpCodeDepbar : OpCode
     {
-        public OpCodeDepbar(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
-        {
-
-        }
+        public OpCodeDepbar(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode) {}
     }
 }
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs
index 8929920eb3..2ee7c2cebf 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Ryujinx.Graphics.Shader.Instructions;
 
 namespace Ryujinx.Graphics.Shader.Decoders
 {
-    class OpCodeNop
+    class OpCodeNop : OpCode
     {
-        public OpCodeNop(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
-        {
-
-        }
+        public OpCodeNop(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode) {}
     }
 }
diff --git a/Ryujinx.Graphics.Shader/Instructions/InstEmitFlow.cs b/Ryujinx.Graphics.Shader/Instructions/InstEmitFlow.cs
index 545fbb0ccd..2bdda4322e 100644
--- a/Ryujinx.Graphics.Shader/Instructions/InstEmitFlow.cs
+++ b/Ryujinx.Graphics.Shader/Instructions/InstEmitFlow.cs
@@ -51,10 +51,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
             }
         }
 
-        public static void Depbar(EmitterContext context)
-        {
-            return;
-        }
+        public static void Depbar(EmitterContext context) {}
 
         public static void Exit(EmitterContext context)
         {
@@ -73,10 +70,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
             context.Discard();
         }
 
-        public static void Nop(EmitterContext context)
-        {
-            return;
-        }
+        public static void Nop(EmitterContext context) {}
 
         public static void Pbk(EmitterContext context)
         {