Remove unneeded "this." qualifiers.

Re-align ACond enum.
Add back in the underscores in ACryptoHelper

ChocolArm64/AOpCodeTable.cs

@@ -565,9 +565,9 @@ namespace ChocolArm64
 
             public InstInfo(int mask, int value, AInst inst)
             {
-                this.Mask  = mask;
-                this.Value = value;
-                this.Inst  = inst;
+                Mask  = mask;
+                Value = value;
+                Inst  = inst;
             }
         }
 

ChocolArm64/AThread.cs

@@ -20,8 +20,8 @@ namespace ChocolArm64
 
         public AThread(ATranslator translator, AMemory memory, long entryPoint)
         {
-            this._translator = translator;
-            this.Memory     = memory;
+            _translator = translator;
+            Memory     = memory;
 
             ThreadState = new AThreadState();
 

ChocolArm64/ATranslatedSub.cs

@@ -46,7 +46,7 @@ namespace ChocolArm64
                 throw new ArgumentNullException(nameof(Params));
             }
 
-            this.Method = method;
+            Method = method;
             this.Params = Params.AsReadOnly();
 
             _callers = new HashSet<long>();
@@ -137,7 +137,7 @@ namespace ChocolArm64
 
         public void SetType(ATranslatedSubType type)
         {
-            this._type = type;
+            _type = type;
 
             if (type == ATranslatedSubType.SubTier0)
             {

ChocolArm64/ATranslatorCache.cs

@@ -31,15 +31,15 @@ namespace ChocolArm64
 
             public CacheBucket(ATranslatedSub subroutine, LinkedListNode<long> node, int size)
             {
-                this.Subroutine = subroutine;
-                this.Size       = size;
+                Subroutine = subroutine;
+                Size       = size;
 
                 UpdateNode(node);
             }
 
             public void UpdateNode(LinkedListNode<long> node)
             {
-                this.Node = node;
+                Node = node;
 
                 Timestamp = Environment.TickCount;
             }

ChocolArm64/Decoder/ABlock.cs

@@ -19,7 +19,7 @@ namespace ChocolArm64.Decoder
 
         public ABlock(long position) : this()
         {
-            this.Position = position;
+            Position = position;
         }
 
         public AOpCode GetLastOp()

ChocolArm64/Decoder/ACond.cs

@@ -4,14 +4,14 @@ namespace ChocolArm64.Decoder
     {
         Eq    = 0,
         Ne    = 1,
-        GeUn = 2,
-        LtUn = 3,
+        GeUn  = 2,
+        LtUn  = 3,
         Mi    = 4,
         Pl    = 5,
         Vs    = 6,
         Vc    = 7,
-        GtUn = 8,
-        LeUn = 9,
+        GtUn  = 8,
+        LeUn  = 9,
         Ge    = 10,
         Lt    = 11,
         Gt    = 12,

ChocolArm64/Decoder/AOpCode.cs

@@ -15,8 +15,8 @@ namespace ChocolArm64.Decoder
 
         public AOpCode(AInst inst, long position, int opCode)
         {
-            this.Position  = position;
-            this.RawOpCode = opCode;
+            Position  = position;
+            RawOpCode = opCode;
 
             RegisterSize = ARegisterSize.Int64;
 

ChocolArm64/Decoder/AOpCodeAluRs.cs

@@ -20,7 +20,7 @@ namespace ChocolArm64.Decoder
                 return;
             }
 
-            this.Shift = shift;
+            Shift = shift;
 
             Rm        =              (opCode >> 16) & 0x1f;
             ShiftType = (AShiftType)((opCode >> 22) & 0x3);

ChocolArm64/Decoder/AOpCodeSimdFmov.cs

@@ -27,7 +27,7 @@ namespace ChocolArm64.Decoder
             Rd  = (opCode >>  0) & 0x1f;
             imm = (opCode >> 13) & 0xff;
 
-            this.Imm = ADecoderHelper.DecodeImm8Float(imm, type);
+            Imm = ADecoderHelper.DecodeImm8Float(imm, type);
         }
     }
 }

ChocolArm64/Decoder/AOpCodeSimdImm.cs

@@ -79,7 +79,7 @@ namespace ChocolArm64.Decoder
                 Size = 0;
             }
 
-            this.Imm = imm;
+            Imm = imm;
 
             RegisterSize = ((opCode >> 30) & 1) != 0
                 ? ARegisterSize.Simd128

ChocolArm64/Decoder/AOpCodeSimdMemSs.cs

@@ -82,9 +82,9 @@ namespace ChocolArm64.Decoder
                 }
             }
 
-            this.Index  = index;
-            this.SElems = sElems;
-            this.Size   = scale;
+            Index  = index;
+            SElems = sElems;
+            Size   = scale;
 
             Extend64 = false;
 

ChocolArm64/Events/ACpuTraceEventArgs.cs

@@ -8,7 +8,7 @@ namespace ChocolArm64.Events
 
         public ACpuTraceEventArgs(long position)
         {
-            this.Position = position;
+            Position = position;
         }
     }
 }

ChocolArm64/Events/AInstExceptionEventArgs.cs

@@ -9,8 +9,8 @@ namespace ChocolArm64.Events
 
         public AInstExceptionEventArgs(long position, int id)
         {
-            this.Position = position;
-            this.Id       = id;
+            Position = position;
+            Id       = id;
         }
     }
 }

ChocolArm64/Events/AInstUndefinedEventArgs.cs

@@ -9,8 +9,8 @@ namespace ChocolArm64.Events
 
         public AInstUndefinedEventArgs(long position, int rawOpCode)
         {
-            this.Position  = position;
-            this.RawOpCode = rawOpCode;
+            Position  = position;
+            RawOpCode = rawOpCode;
         }
     }
 }

ChocolArm64/Events/AInvalidAccessEventArgs.cs

@@ -8,7 +8,7 @@ namespace ChocolArm64.Events
 
         public AInvalidAccessEventArgs(long position)
         {
-            this.Position = position;
+            Position = position;
         }
     }
 }

ChocolArm64/Instruction/ACryptoHelper.cs

@@ -49,7 +49,7 @@ namespace ChocolArm64.Instruction
             0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
         };
 
-        private static byte[] _gfMul02 =
+        private static byte[] _gfMul_02 =
         {
             0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
             0x20, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e,
@@ -69,7 +69,7 @@ namespace ChocolArm64.Instruction
             0xfb, 0xf9, 0xff, 0xfd, 0xf3, 0xf1, 0xf7, 0xf5, 0xeb, 0xe9, 0xef, 0xed, 0xe3, 0xe1, 0xe7, 0xe5
         };
 
-        private static byte[] _gfMul03 =
+        private static byte[] _gfMul_03 =
         {
             0x00, 0x03, 0x06, 0x05, 0x0c, 0x0f, 0x0a, 0x09, 0x18, 0x1b, 0x1e, 0x1d, 0x14, 0x17, 0x12, 0x11,
             0x30, 0x33, 0x36, 0x35, 0x3c, 0x3f, 0x3a, 0x39, 0x28, 0x2b, 0x2e, 0x2d, 0x24, 0x27, 0x22, 0x21,
@@ -89,7 +89,7 @@ namespace ChocolArm64.Instruction
             0x0b, 0x08, 0x0d, 0x0e, 0x07, 0x04, 0x01, 0x02, 0x13, 0x10, 0x15, 0x16, 0x1f, 0x1c, 0x19, 0x1a
         };
 
-        private static byte[] _gfMul09 =
+        private static byte[] _gfMul_09 =
         {
             0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x3f, 0x48, 0x41, 0x5a, 0x53, 0x6c, 0x65, 0x7e, 0x77,
             0x90, 0x99, 0x82, 0x8b, 0xb4, 0xbd, 0xa6, 0xaf, 0xd8, 0xd1, 0xca, 0xc3, 0xfc, 0xf5, 0xee, 0xe7,
@@ -190,10 +190,10 @@ namespace ChocolArm64.Instruction
                 byte row2 = inState[idx + 2]; // C, G, K, O: [Row2, Col0-Col3]
                 byte row3 = inState[idx + 3]; // D, H, L, P: [Row3, Col0-Col3]
 
-                outState[idx + 0] = (byte)((uint)_gfMul_0E[row0] ^ _gfMul_0B[row1] ^ _gfMul_0D[row2] ^ _gfMul09[row3]);
-                outState[idx + 1] = (byte)((uint)_gfMul09[row0] ^ _gfMul_0E[row1] ^ _gfMul_0B[row2] ^ _gfMul_0D[row3]);
-                outState[idx + 2] = (byte)((uint)_gfMul_0D[row0] ^ _gfMul09[row1] ^ _gfMul_0E[row2] ^ _gfMul_0B[row3]);
-                outState[idx + 3] = (byte)((uint)_gfMul_0B[row0] ^ _gfMul_0D[row1] ^ _gfMul09[row2] ^ _gfMul_0E[row3]);
+                outState[idx + 0] = (byte)((uint)_gfMul_0E[row0] ^ _gfMul_0B[row1] ^ _gfMul_0D[row2] ^ _gfMul_09[row3]);
+                outState[idx + 1] = (byte)((uint)_gfMul_09[row0] ^ _gfMul_0E[row1] ^ _gfMul_0B[row2] ^ _gfMul_0D[row3]);
+                outState[idx + 2] = (byte)((uint)_gfMul_0D[row0] ^ _gfMul_09[row1] ^ _gfMul_0E[row2] ^ _gfMul_0B[row3]);
+                outState[idx + 3] = (byte)((uint)_gfMul_0B[row0] ^ _gfMul_0D[row1] ^ _gfMul_09[row2] ^ _gfMul_0E[row3]);
             }
 
             FromByteArrayToVector(outState, ref op);
@@ -251,10 +251,10 @@ namespace ChocolArm64.Instruction
                 byte row2 = inState[idx + 2]; // C, G, K, O: [Row2, Col0-Col3]
                 byte row3 = inState[idx + 3]; // D, H, L, P: [Row3, Col0-Col3]
 
-                outState[idx + 0] = (byte)((uint)_gfMul02[row0] ^ _gfMul03[row1] ^ row2 ^ row3);
-                outState[idx + 1] = (byte)((uint)row0 ^ _gfMul02[row1] ^ _gfMul03[row2] ^ row3);
-                outState[idx + 2] = (byte)((uint)row0 ^ row1 ^ _gfMul02[row2] ^ _gfMul03[row3]);
-                outState[idx + 3] = (byte)((uint)_gfMul03[row0] ^ row1 ^ row2 ^ _gfMul02[row3]);
+                outState[idx + 0] = (byte)((uint)_gfMul_02[row0] ^ _gfMul_03[row1] ^ row2 ^ row3);
+                outState[idx + 1] = (byte)((uint)row0 ^ _gfMul_02[row1] ^ _gfMul_03[row2] ^ row3);
+                outState[idx + 2] = (byte)((uint)row0 ^ row1 ^ _gfMul_02[row2] ^ _gfMul_03[row3]);
+                outState[idx + 3] = (byte)((uint)_gfMul_03[row0] ^ row1 ^ row2 ^ _gfMul_02[row3]);
             }
 
             FromByteArrayToVector(outState, ref op);

ChocolArm64/Instruction/AInst.cs

@@ -12,9 +12,9 @@ namespace ChocolArm64.Instruction
 
         public AInst(AInstInterpreter interpreter, AInstEmitter emitter, Type type)
         {
-            this.Interpreter = interpreter;
-            this.Emitter     = emitter;
-            this.Type        = type;
+            Interpreter = interpreter;
+            Emitter     = emitter;
+            Type        = type;
         }
     }
 }

ChocolArm64/Memory/AMemory.cs

@@ -38,7 +38,7 @@ namespace ChocolArm64.Memory
 
             public bool HasExclusiveAccess(long position)
             {
-                return this.Position == position && ExState;
+                return Position == position && ExState;
             }
         }
 
@@ -60,7 +60,7 @@ namespace ChocolArm64.Memory
 
             _observedPages = new ConcurrentDictionary<long, IntPtr>();
 
-            this.Ram = ram;
+            Ram = ram;
 
             _ramPtr = (byte*)ram;
 

ChocolArm64/State/ARegister.cs

@@ -11,8 +11,8 @@ namespace ChocolArm64.State
 
         public ARegister(int index, ARegisterType type)
         {
-            this.Index = index;
-            this.Type  = type;
+            Index = index;
+            Type  = type;
         }
 
         public override int GetHashCode()

ChocolArm64/Translation/AILEmitter.cs

@@ -27,7 +27,7 @@ namespace ChocolArm64.Translation
 
         public AilEmitter(ABlock[] graph, ABlock root, string subName)
         {
-            this._subName = subName;
+            _subName = subName;
 
             _locals = new Dictionary<ARegister, int>();
 
@@ -56,7 +56,7 @@ namespace ChocolArm64.Translation
                 block.Branch = GetBlock(Array.IndexOf(graph, graph[index].Branch));
             }
 
-            this._root = _ilBlocks[Array.IndexOf(graph, root)];
+            _root = _ilBlocks[Array.IndexOf(graph, root)];
         }
 
         public AilBlock GetIlBlock(int index) => _ilBlocks[index];

ChocolArm64/Translation/AILEmitterCtx.cs

@@ -45,9 +45,9 @@ namespace ChocolArm64.Translation
             ABlock           root,
             string           subName)
         {
-            this._cache = cache ?? throw new ArgumentNullException(nameof(cache));
-            this._graph = graph ?? throw new ArgumentNullException(nameof(graph));
-            this._root  = root  ?? throw new ArgumentNullException(nameof(root));
+            _cache = cache ?? throw new ArgumentNullException(nameof(cache));
+            _graph = graph ?? throw new ArgumentNullException(nameof(graph));
+            _root  = root  ?? throw new ArgumentNullException(nameof(root));
 
             _labels = new Dictionary<long, AilLabel>();
 

ChocolArm64/Translation/AILOpCode.cs

@@ -8,7 +8,7 @@ namespace ChocolArm64.Translation
 
         public AilOpCode(OpCode ilOp)
         {
-            this._ilOp = ilOp;
+            _ilOp = ilOp;
         }
 
         public void Emit(AilEmitter context)

ChocolArm64/Translation/AILOpCodeBranch.cs

@@ -9,8 +9,8 @@ namespace ChocolArm64.Translation
 
         public AilOpCodeBranch(OpCode ilOp, AilLabel label)
         {
-            this._ilOp  = ilOp;
-            this._label = label;
+            _ilOp  = ilOp;
+            _label = label;
         }
 
         public void Emit(AilEmitter context)

ChocolArm64/Translation/AILOpCodeCall.cs

@@ -9,7 +9,7 @@ namespace ChocolArm64.Translation
 
         public AilOpCodeCall(MethodInfo mthdInfo)
         {
-            this._mthdInfo = mthdInfo;
+            _mthdInfo = mthdInfo;
         }
 
         public void Emit(AilEmitter context)

ChocolArm64/Translation/AILOpCodeConst.cs

@@ -28,27 +28,27 @@ namespace ChocolArm64.Translation
 
         private AilOpCodeConst(ConstType type)
         {
-            this._type = type;
+            _type = type;
         }
 
         public AilOpCodeConst(int value) : this(ConstType.Int32)
         {
-            this._value = new ImmVal { I4 = value };
+            _value = new ImmVal { I4 = value };
         }
 
         public AilOpCodeConst(long value) : this(ConstType.Int64)
         {
-            this._value = new ImmVal { I8 = value };
+            _value = new ImmVal { I8 = value };
         }
 
         public AilOpCodeConst(float value) : this(ConstType.Single)
         {
-            this._value = new ImmVal { R4 = value };
+            _value = new ImmVal { R4 = value };
         }
 
         public AilOpCodeConst(double value) : this(ConstType.Double)
         {
-            this._value = new ImmVal { R8 = value };
+            _value = new ImmVal { R8 = value };
         }
 
         public void Emit(AilEmitter context)

ChocolArm64/Translation/AILOpCodeLoad.cs

@@ -13,9 +13,9 @@ namespace ChocolArm64.Translation
 
         public AilOpCodeLoad(int index, AIoType ioType, ARegisterSize registerSize = 0)
         {
-            this.Index        = index;
-            this.IoType       = ioType;
-            this.RegisterSize = registerSize;
+            Index        = index;
+            IoType       = ioType;
+            RegisterSize = registerSize;
         }
 
         public void Emit(AilEmitter context)

ChocolArm64/Translation/AILOpCodeLog.cs

@@ -6,7 +6,7 @@ namespace ChocolArm64.Translation
 
         public AilOpCodeLog(string text)
         {
-            this._text = text;
+            _text = text;
         }
 
         public void Emit(AilEmitter context)

ChocolArm64/Translation/AILOpCodeStore.cs

@@ -13,9 +13,9 @@ namespace ChocolArm64.Translation
 
         public AilOpCodeStore(int index, AIoType ioType, ARegisterSize registerSize = 0)
         {
-            this.Index        = index;
-            this.IoType       = ioType;
-            this.RegisterSize = registerSize;
+            Index        = index;
+            IoType       = ioType;
+            RegisterSize = registerSize;
         }
 
         public void Emit(AilEmitter context)

Ryujinx.Audio/OpenAL/OpenALAudioOut.cs

@@ -38,9 +38,9 @@ namespace Ryujinx.Audio.OpenAL
 
             public Track(int sampleRate, ALFormat format, ReleaseCallback callback)
             {
-                this.SampleRate = sampleRate;
-                this.Format     = format;
-                this._callback   = callback;
+                SampleRate = sampleRate;
+                Format     = format;
+                _callback   = callback;
 
                 State = PlaybackState.Stopped;
 

Ryujinx.Common/Logging/LogEventArgs.cs

@@ -11,9 +11,9 @@ namespace Ryujinx.Common.Logging
 
         public LogEventArgs(LogLevel level, TimeSpan time, string message)
         {
-            this.Level   = level;
-            this.Time    = time;
-            this.Message = message;
+            Level   = level;
+            Time    = time;
+            Message = message;
         }
     }
 }

Ryujinx.Graphics/Gal/GalColorF.cs

@@ -13,10 +13,10 @@ namespace Ryujinx.Graphics.Gal
             float blue,
             float alpha)
         {
-            this.Red   = red;
-            this.Green = green;
-            this.Blue  = blue;
-            this.Alpha = alpha;
+            Red   = red;
+            Green = green;
+            Blue  = blue;
+            Alpha = alpha;
         }
     }
 }

Ryujinx.Graphics/Gal/GalImage.cs

@@ -29,16 +29,16 @@ namespace Ryujinx.Graphics.Gal
             GalTextureSource zSource = GalTextureSource.Blue,
             GalTextureSource wSource = GalTextureSource.Alpha)
         {
-            this.Width          = width;
-            this.Height         = height;
-            this.TileWidth      = tileWidth;
-            this.GobBlockHeight = gobBlockHeight;
-            this.Layout         = layout;
-            this.Format         = format;
-            this.XSource        = xSource;
-            this.YSource        = ySource;
-            this.ZSource        = zSource;
-            this.WSource        = wSource;
+            Width          = width;
+            Height         = height;
+            TileWidth      = tileWidth;
+            GobBlockHeight = gobBlockHeight;
+            Layout         = layout;
+            Format         = format;
+            XSource        = xSource;
+            YSource        = ySource;
+            ZSource        = zSource;
+            WSource        = wSource;
 
             Pitch = ImageUtils.GetPitch(format, width);
         }

Ryujinx.Graphics/Gal/GalTextureSampler.cs

@@ -21,13 +21,13 @@ namespace Ryujinx.Graphics.Gal
             GalTextureMipFilter mipFilter,
             GalColorF           borderColor)
         {
-            this.AddressU    = addressU;
-            this.AddressV    = addressV;
-            this.AddressP    = addressP;
-            this.MinFilter   = minFilter;
-            this.MagFilter   = magFilter;
-            this.MipFilter   = mipFilter;
-            this.BorderColor = borderColor;
+            AddressU    = addressU;
+            AddressV    = addressV;
+            AddressP    = addressP;
+            MinFilter   = minFilter;
+            MagFilter   = magFilter;
+            MipFilter   = mipFilter;
+            BorderColor = borderColor;
         }
     }
 }

Ryujinx.Graphics/Gal/GalVertexAttrib.cs

@@ -23,13 +23,13 @@ namespace Ryujinx.Graphics.Gal
             GalVertexAttribType type,
             bool                isBgra)
         {
-            this.Index   = index;
-            this.IsConst = isConst;
-            this.Pointer = pointer;
-            this.Offset  = offset;
-            this.Size    = size;
-            this.Type    = type;
-            this.IsBgra  = isBgra;
+            Index   = index;
+            IsConst = isConst;
+            Pointer = pointer;
+            Offset  = offset;
+            Size    = size;
+            Type    = type;
+            IsBgra  = isBgra;
         }
     }
 }

Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs

@@ -19,8 +19,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         public ImageHandler(int handle, GalImage image)
         {
-            this.Handle = handle;
-            this.Image  = image;
+            Handle = handle;
+            Image  = image;
         }
     }
 }

Ryujinx.Graphics/Gal/OpenGL/OGLCachedResource.cs

@@ -22,9 +22,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
             public CacheBucket(T value, long dataSize, LinkedListNode<long> node)
             {
-                this.Value    = value;
-                this.DataSize = dataSize;
-                this.Node     = node;
+                Value    = value;
+                DataSize = dataSize;
+                Node     = node;
 
                 Timestamp = Environment.TickCount;
             }
@@ -47,7 +47,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
                 throw new ArgumentNullException(nameof(deleteValueCallback));
             }
 
-            this._deleteValueCallback = deleteValueCallback;
+            _deleteValueCallback = deleteValueCallback;
 
             _cache = new Dictionary<long, CacheBucket>();
 

Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs

@@ -85,9 +85,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         public OglPipeline(OglConstBuffer buffer, OglRasterizer rasterizer, OglShader shader)
         {
-            this._buffer     = buffer;
-            this._rasterizer = rasterizer;
-            this._shader     = shader;
+            _buffer     = buffer;
+            _rasterizer = rasterizer;
+            _shader     = shader;
 
             //These values match OpenGL's defaults
             _old = new GalPipelineState

Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs

@@ -20,10 +20,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
             public Rect(int x, int y, int width, int height)
             {
-                this.X      = x;
-                this.Y      = y;
-                this.Width  = width;
-                this.Height = height;
+                X      = x;
+                Y      = y;
+                Width  = width;
+                Height = height;
             }
         }
 
@@ -282,8 +282,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         public void SetTransform(bool flipX, bool flipY, int top, int left, int right, int bottom)
         {
-            this._flipX = flipX;
-            this._flipY = flipY;
+            _flipX = flipX;
+            _flipY = flipY;
 
             _cropTop    = top;
             _cropLeft   = left;

Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         public OglShader(OglConstBuffer buffer)
         {
-            this._buffer = buffer;
+            _buffer = buffer;
 
             _stages = new ConcurrentDictionary<long, OglShaderStage>();
 

Ryujinx.Graphics/Gal/OpenGL/OGLShaderProgram.cs

@@ -32,10 +32,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             IEnumerable<ShaderDeclInfo> constBufferUsage,
             IEnumerable<ShaderDeclInfo> textureUsage)
         {
-            this.Type             = type;
-            this.Code             = code;
-            this.ConstBufferUsage = constBufferUsage;
-            this.TextureUsage     = textureUsage;
+            Type             = type;
+            Code             = code;
+            ConstBufferUsage = constBufferUsage;
+            TextureUsage     = textureUsage;
         }
 
         public void Compile()

Ryujinx.Graphics/Gal/OpenGL/OGLStreamBuffer.cs

@@ -13,8 +13,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         public OglStreamBuffer(BufferTarget target, long size)
         {
-            this.Target = target;
-            this.Size   = size;
+            Target = target;
+            Size   = size;
 
             Handle = GL.GenBuffer();
 

Ryujinx.Graphics/Gal/Shader/GlslDecl.cs

@@ -83,7 +83,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         private GlslDecl(GalShaderType shaderType)
         {
-            this.ShaderType = shaderType;
+            ShaderType = shaderType;
 
             _mCbTextures = new Dictionary<ShaderIrOp, ShaderDeclInfo>();
 

Ryujinx.Graphics/Gal/Shader/GlslProgram.cs

@@ -14,9 +14,9 @@ namespace Ryujinx.Graphics.Gal.Shader
             IEnumerable<ShaderDeclInfo> textures,
             IEnumerable<ShaderDeclInfo> uniforms)
         {
-            this.Code     = code;
-            this.Textures = textures;
-            this.Uniforms = uniforms;
+            Code     = code;
+            Textures = textures;
+            Uniforms = uniforms;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrAsg.cs

@@ -7,8 +7,8 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrAsg(ShaderIrNode dst, ShaderIrNode src)
         {
-            this.Dst = dst;
-            this.Src = src;
+            Dst = dst;
+            Src = src;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrBlock.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrBlock(int position)
         {
-            this.Position = position;
+            Position = position;
 
             Sources = new List<ShaderIrBlock>();
 

Ryujinx.Graphics/Gal/Shader/ShaderIrCmnt.cs

@@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrCmnt(string comment)
         {
-            this.Comment = comment;
+            Comment = comment;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrCond.cs

@@ -9,9 +9,9 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrCond(ShaderIrNode pred, ShaderIrNode child, bool not)
         {
-            this.Pred  = pred;
-            this.Child = child;
-            this.Not   = not;
+            Pred  = pred;
+            Child = child;
+            Not   = not;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrMetaIpa.cs

@@ -6,7 +6,7 @@
 
         public ShaderIrMetaIpa(ShaderIpaMode mode)
         {
-            this.Mode = mode;
+            Mode = mode;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTex.cs

@@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrMetaTex(int elem)
         {
-            this.Elem = elem;
+            Elem = elem;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTexq.cs

@@ -8,8 +8,8 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrMetaTexq(ShaderTexqInfo info, int elem)
         {
-            this.Info = info;
-            this.Elem = elem;
+            Info = info;
+            Elem = elem;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrOp.cs

@@ -15,11 +15,11 @@ namespace Ryujinx.Graphics.Gal.Shader
             ShaderIrNode operandC = null,
             ShaderIrMeta metaData = null)
         {
-            this.Inst     = inst;
-            this.OperandA = operandA;
-            this.OperandB = operandB;
-            this.OperandC = operandC;
-            this.MetaData = metaData;
+            Inst     = inst;
+            OperandA = operandA;
+            OperandB = operandB;
+            OperandC = operandC;
+            MetaData = metaData;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrOperAbuf.cs

@@ -8,8 +8,8 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrOperAbuf(int offs, ShaderIrNode vertex)
         {
-            this.Offs   = offs;
-            this.Vertex = vertex;
+            Offs   = offs;
+            Vertex = vertex;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrOperCbuf.cs

@@ -9,9 +9,9 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrOperCbuf(int index, int pos, ShaderIrNode offs = null)
         {
-            this.Index = index;
-            this.Pos   = pos;
-            this.Offs  = offs;
+            Index = index;
+            Pos   = pos;
+            Offs  = offs;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrOperGpr.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrOperGpr(int index)
         {
-            this.Index = index;
+            Index = index;
         }
 
         public static ShaderIrOperGpr MakeTemporary(int index = 0)

Ryujinx.Graphics/Gal/Shader/ShaderIrOperImm.cs

@@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrOperImm(int value)
         {
-            this.Value = value;
+            Value = value;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrOperImmf.cs

@@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrOperImmf(float value)
         {
-            this.Value = value;
+            Value = value;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderIrOperPred.cs

@@ -11,7 +11,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public ShaderIrOperPred(int index)
         {
-            this.Index = index;
+            Index = index;
         }
     }
 }

Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs

@@ -14,8 +14,8 @@ namespace Ryujinx.Graphics.Gal.Shader
 
             public ShaderDecodeEntry(ShaderDecodeFunc func, int xBits)
             {
-                this.Func  = func;
-                this.XBits = xBits;
+                Func  = func;
+                XBits = xBits;
             }
         }
 

Ryujinx.Graphics/Gal/ShaderDeclInfo.cs

@@ -16,11 +16,11 @@ namespace Ryujinx.Graphics.Gal
             int    cbuf = 0,
             int    size = 1)
         {
-            this.Name  = name;
-            this.Index = index;
-            this.IsCb  = isCb;
-            this.Cbuf  = cbuf;
-            this.Size  = size;
+            Name  = name;
+            Index = index;
+            IsCb  = isCb;
+            Cbuf  = cbuf;
+            Size  = size;
         }
 
         internal void Enlarge(int newSize)

Ryujinx.Graphics/GpuResourceManager.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.Graphics
 
         public GpuResourceManager(NvGpu gpu)
         {
-            this._gpu = gpu;
+            _gpu = gpu;
 
             _uploadedKeys = new HashSet<long>[(int)NvGpuBufferType.Count];
 

Ryujinx.Graphics/MacroInterpreter.cs

@@ -61,8 +61,8 @@ namespace Ryujinx.Graphics
 
         public MacroInterpreter(NvGpuFifo pFifo, INvGpuEngine engine)
         {
-            this._pFifo  = pFifo;
-            this._engine = engine;
+            _pFifo  = pFifo;
+            _engine = engine;
 
             Fifo = new Queue<int>();
 

Ryujinx.Graphics/Memory/NvGpuPBEntry.cs

@@ -15,9 +15,9 @@ namespace Ryujinx.Graphics.Memory
 
         public NvGpuPbEntry(int method, int subChannel, params int[] arguments)
         {
-            this.Method      = method;
-            this.SubChannel  = subChannel;
-            this._mArguments = arguments;
+            Method      = method;
+            SubChannel  = subChannel;
+            _mArguments = arguments;
         }
     }
 }

Ryujinx.Graphics/Memory/NvGpuVmm.cs

@@ -34,7 +34,7 @@ namespace Ryujinx.Graphics.Memory
 
         public NvGpuVmm(AMemory memory)
         {
-            this.Memory = memory;
+            Memory = memory;
 
             _cache = new NvGpuVmmCache();
 

Ryujinx.Graphics/NvGpu.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Graphics
 
         public NvGpu(IGalRenderer renderer)
         {
-            this.Renderer = renderer;
+            Renderer = renderer;
 
             ResourceManager = new GpuResourceManager(this);
 

Ryujinx.Graphics/NvGpuEngine2d.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Graphics
 
         public NvGpuEngine2D(NvGpu gpu)
         {
-            this._gpu = gpu;
+            _gpu = gpu;
 
             Registers = new int[0xe00];
 

Ryujinx.Graphics/NvGpuEngine3d.cs

@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics
 
         public NvGpuEngine3D(NvGpu gpu)
         {
-            this._gpu = gpu;
+            _gpu = gpu;
 
             Registers = new int[0xe00];
 

Ryujinx.Graphics/NvGpuEngineM2mf.cs

@@ -14,7 +14,7 @@ namespace Ryujinx.Graphics
 
         public NvGpuEngineM2Mf(NvGpu gpu)
         {
-            this._gpu = gpu;
+            _gpu = gpu;
 
             Registers = new int[0x1d6];
 

Ryujinx.Graphics/NvGpuEngineP2mf.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.Graphics
 
         public NvGpuEngineP2Mf(NvGpu gpu)
         {
-            this._gpu = gpu;
+            _gpu = gpu;
 
             Registers = new int[0x80];
 

Ryujinx.Graphics/NvGpuFifo.cs

@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics
 
             public CachedMacro(NvGpuFifo pFifo, INvGpuEngine engine, int position)
             {
-                this.Position = position;
+                Position = position;
 
                 _interpreter = new MacroInterpreter(pFifo, engine);
             }
@@ -54,7 +54,7 @@ namespace Ryujinx.Graphics
 
         public NvGpuFifo(NvGpu gpu)
         {
-            this._gpu = gpu;
+            _gpu = gpu;
 
             _bufferQueue = new ConcurrentQueue<(NvGpuVmm, NvGpuPbEntry[])>();
 

Ryujinx.Graphics/Texture/ImageUtils.cs

@@ -28,10 +28,10 @@ namespace Ryujinx.Graphics.Texture
 
             public ImageDescriptor(int bytesPerPixel, int blockWidth, int blockHeight, TargetBuffer target)
             {
-                this.BytesPerPixel = bytesPerPixel;
-                this.BlockWidth    = blockWidth;
-                this.BlockHeight   = blockHeight;
-                this.Target        = target;
+                BytesPerPixel = bytesPerPixel;
+                BlockWidth    = blockWidth;
+                BlockHeight   = blockHeight;
+                Target        = target;
             }
         }
 
@@ -265,7 +265,7 @@ namespace Ryujinx.Graphics.Texture
 
             ImageDescriptor desc = GetImageDescriptor(image.Format);
 
-            (int width, int height) = ImageUtils.GetImageSizeInBlocks(image);
+            (int width, int height) = GetImageSizeInBlocks(image);
 
             int bytesPerPixel = desc.BytesPerPixel;
 

Ryujinx.Graphics/Texture/LinearSwizzle.cs

@@ -7,8 +7,8 @@ namespace Ryujinx.Graphics.Texture
 
         public LinearSwizzle(int pitch, int bpp)
         {
-            this._pitch = pitch;
-            this._bpp   = bpp;
+            _pitch = pitch;
+            _bpp   = bpp;
         }
 
         public int GetSwizzleOffset(int x, int y)

Ryujinx.Graphics/ValueRange.cs

@@ -9,9 +9,9 @@ namespace Ryujinx.Graphics
 
         public ValueRange(long start, long end, T value = default(T))
         {
-            this.Start = start;
-            this.End   = end;
-            this.Value = value;
+            Start = start;
+            End   = end;
+            Value = value;
         }
     }
 }

Ryujinx.HLE/FileSystem/SaveInfo.cs

@@ -18,11 +18,11 @@ namespace Ryujinx.HLE.FileSystem
             UInt128       userId,
             SaveSpaceId  saveSpaceId)
         {
-            this.TitleId      = titleId;
-            this.UserId       = userId;
-            this.SaveId       = saveId;
-            this.SaveDataType = saveDataType;
-            this.SaveSpaceId  = saveSpaceId;
+            TitleId      = titleId;
+            UserId       = userId;
+            SaveId       = saveId;
+            SaveDataType = saveDataType;
+            SaveSpaceId  = saveSpaceId;
         }
     }
 }

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArraySubscriptingExpression.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public ArraySubscriptingExpression(BaseNode leftNode, BaseNode subscript) : base(NodeType.ArraySubscriptingExpression)
         {
-            this._leftNode  = leftNode;
-            this._subscript = subscript;
+            _leftNode  = leftNode;
+            _subscript = subscript;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArrayType.cs

@@ -10,14 +10,14 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public ArrayType(BaseNode Base, BaseNode dimensionExpression = null) : base(NodeType.ArrayType)
         {
-            this._base                = Base;
-            this._dimensionExpression = dimensionExpression;
+            _base                = Base;
+            _dimensionExpression = dimensionExpression;
         }
 
         public ArrayType(BaseNode Base, string dimensionString) : base(NodeType.ArrayType)
         {
-            this._base            = Base;
-            this._dimensionString = dimensionString;
+            _base            = Base;
+            _dimensionString = dimensionString;
         }
 
         public override bool HasRightPart()

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BaseNode.cs

@@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public BaseNode(NodeType type)
         {
-            this.Type = type;
+            Type = type;
         }
 
         public virtual void Print(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BinaryExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public BinaryExpression(BaseNode leftPart, string name, BaseNode rightPart) : base(NodeType.BinaryExpression)
         {
-            this._leftPart  = leftPart;
-            this._name      = name;
-            this._rightPart = rightPart;
+            _leftPart  = leftPart;
+            _name      = name;
+            _rightPart = rightPart;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public BracedExpression(BaseNode element, BaseNode expression, bool isArrayExpression) : base(NodeType.BracedExpression)
         {
-            this._element           = element;
-            this._expression        = expression;
-            this._isArrayExpression = isArrayExpression;
+            _element           = element;
+            _expression        = expression;
+            _isArrayExpression = isArrayExpression;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedRangeExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public BracedRangeExpression(BaseNode firstNode, BaseNode lastNode, BaseNode expression) : base(NodeType.BracedRangeExpression)
         {
-            this._firstNode  = firstNode;
-            this._lastNode   = lastNode;
-            this._expression = expression;
+            _firstNode  = firstNode;
+            _lastNode   = lastNode;
+            _expression = expression;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CallExpression.cs

@@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public CallExpression(BaseNode callee, List<BaseNode> nodes) : base(nodes, NodeType.CallExpression)
         {
-            this._callee = callee;
+            _callee = callee;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CastExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public CastExpression(string kind, BaseNode to, BaseNode @from) : base(NodeType.CastExpression)
         {
-            this._kind = kind;
-            this._to   = to;
-            this._from = @from;
+            _kind = kind;
+            _to   = to;
+            _from = @from;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConditionalExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public ConditionalExpression(BaseNode conditionNode, BaseNode thenNode, BaseNode elseNode) : base(NodeType.ConditionalExpression)
         {
-            this._thenNode      = thenNode;
-            this._conditionNode = conditionNode;
-            this._elseNode      = elseNode;
+            _thenNode      = thenNode;
+            _conditionNode = conditionNode;
+            _elseNode      = elseNode;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConversionExpression.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public ConversionExpression(BaseNode typeNode, BaseNode expressions) : base(NodeType.ConversionExpression)
         {
-            this._typeNode    = typeNode;
-            this._expressions = expressions;
+            _typeNode    = typeNode;
+            _expressions = expressions;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorDtorNameType.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public CtorDtorNameType(BaseNode name, bool isDestructor) : base(NodeType.CtorDtorNameType, name)
         {
-            this._isDestructor = isDestructor;
+            _isDestructor = isDestructor;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorVtableSpecialName.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public CtorVtableSpecialName(BaseNode firstType, BaseNode secondType) : base(NodeType.CtorVtableSpecialName)
         {
-            this._firstType  = firstType;
-            this._secondType = secondType;
+            _firstType  = firstType;
+            _secondType = secondType;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DeleteExpression.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public DeleteExpression(BaseNode child, bool isGlobal, bool isArrayExpression) : base(NodeType.DeleteExpression, child)
         {
-            this._isGlobal          = isGlobal;
-            this._isArrayExpression = isArrayExpression;
+            _isGlobal          = isGlobal;
+            _isArrayExpression = isArrayExpression;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ElaboratedType.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public ElaboratedType(string elaborated, BaseNode type) : base(NodeType.ElaboratedType, type)
         {
-            this._elaborated = elaborated;
+            _elaborated = elaborated;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EnclosedExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public EnclosedExpression(string prefix, BaseNode expression, string postfix) : base(NodeType.EnclosedExpression)
         {
-            this._prefix     = prefix;
-            this._expression = expression;
-            this._postfix    = postfix;
+            _prefix     = prefix;
+            _expression = expression;
+            _postfix    = postfix;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EncodedFunction.cs

@@ -13,12 +13,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public EncodedFunction(BaseNode name, BaseNode Params, BaseNode cv, BaseNode Ref, BaseNode attrs, BaseNode ret) : base(NodeType.NameType)
         {
-            this._name   = name;
-            this._params = Params;
-            this._cv     = cv;
-            this._ref    = Ref;
-            this._attrs  = attrs;
-            this._ret    = ret;
+            _name   = name;
+            _params = Params;
+            _cv     = cv;
+            _ref    = Ref;
+            _attrs  = attrs;
+            _ret    = ret;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FoldExpression.cs

@@ -11,10 +11,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public FoldExpression(bool isLeftFold, string operatorName, BaseNode expression, BaseNode initializer) : base(NodeType.FunctionParameter)
         {
-            this._isLeftFold   = isLeftFold;
-            this._operatorName = operatorName;
-            this._expression   = expression;
-            this._initializer  = initializer;
+            _isLeftFold   = isLeftFold;
+            _operatorName = operatorName;
+            _expression   = expression;
+            _initializer  = initializer;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ForwardTemplateReference.cs

@@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public ForwardTemplateReference(int index) : base(NodeType.ForwardTemplateReference)
         {
-            this._index = index;
+            _index = index;
         }
 
         public override string GetName()

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionParameter.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public FunctionParameter(string number) : base(NodeType.FunctionParameter)
         {
-            this._number = number;
+            _number = number;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionType.cs

@@ -12,11 +12,11 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public FunctionType(BaseNode returnType, BaseNode Params, BaseNode cvQualifier, SimpleReferenceType referenceQualifier, BaseNode exceptionSpec) : base(NodeType.FunctionType)
         {
-            this._returnType         = returnType;
-            this._params             = Params;
-            this._cvQualifier        = cvQualifier;
-            this._referenceQualifier = referenceQualifier;
-            this._exceptionSpec      = exceptionSpec;
+            _returnType         = returnType;
+            _params             = Params;
+            _cvQualifier        = cvQualifier;
+            _referenceQualifier = referenceQualifier;
+            _exceptionSpec      = exceptionSpec;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/InitListExpression.cs

@@ -10,8 +10,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public InitListExpression(BaseNode typeNode, List<BaseNode> nodes) : base(NodeType.InitListExpression)
         {
-            this._typeNode = typeNode;
-            this._nodes    = nodes;
+            _typeNode = typeNode;
+            _nodes    = nodes;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerCastExpression.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public IntegerCastExpression(BaseNode type, string number) : base(NodeType.IntegerCastExpression, type)
         {
-            this._number = number;
+            _number = number;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public IntegerLiteral(string litteralName, string litteralValue) : base(NodeType.IntegerLiteral)
         {
-            this._litteralValue = litteralValue;
-            this._litteralName  = litteralName;
+            _litteralValue = litteralValue;
+            _litteralName  = litteralName;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/LocalName.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public LocalName(BaseNode encoding, BaseNode entity) : base(NodeType.LocalName)
         {
-            this._encoding = encoding;
-            this._entity   = entity;
+            _encoding = encoding;
+            _entity   = entity;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/MemberExpression.cs

@@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public MemberExpression(BaseNode leftNode, string kind, BaseNode rightNode) : base(NodeType.MemberExpression)
         {
-            this._leftNode  = leftNode;
-            this._kind      = kind;
-            this._rightNode = rightNode;
+            _leftNode  = leftNode;
+            _kind      = kind;
+            _rightNode = rightNode;
         }
 
         public override void PrintLeft(TextWriter writer)

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameType.cs

@@ -8,12 +8,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public NameType(string nameValue, NodeType type) : base(type)
         {
-            this._nameValue = nameValue;
+            _nameValue = nameValue;
         }
 
         public NameType(string nameValue) : base(NodeType.NameType)
         {
-            this._nameValue = nameValue;
+            _nameValue = nameValue;
         }
 
         public override string GetName()

Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameTypeWithTemplateArguments.cs

@@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 
         public NameTypeWithTemplateArguments(BaseNode prev, BaseNode templateArgument) : base(NodeType.NameTypeWithTemplateArguments)
         {
-            this._prev             = prev;
-            this._templateArgument = templateArgument;
+            _prev             = prev;
+            _templateArgument = templateArgument;
         }
 
         public override string GetName()