diff --git a/ChocolArm64/BitUtils.cs b/ChocolArm64/Decoders/BitUtils.cs
similarity index 98%
rename from ChocolArm64/BitUtils.cs
rename to ChocolArm64/Decoders/BitUtils.cs
index 62474bfbc5..8b9fb5e3cb 100644
--- a/ChocolArm64/BitUtils.cs
+++ b/ChocolArm64/Decoders/BitUtils.cs
@@ -1,4 +1,4 @@
-namespace ChocolArm64
+namespace ChocolArm64.Decoders
 {
     static class BitUtils
     {
diff --git a/ChocolArm64/State/CpuThreadState.cs b/ChocolArm64/State/CpuThreadState.cs
index 26df13bde6..6c00bf482f 100644
--- a/ChocolArm64/State/CpuThreadState.cs
+++ b/ChocolArm64/State/CpuThreadState.cs
@@ -15,7 +15,6 @@ namespace ChocolArm64.State
 
         public bool Thumb;
 
-        //AArch64 state.
         public ulong X0,  X1,  X2,  X3,  X4,  X5,  X6,  X7,
                      X8,  X9,  X10, X11, X12, X13, X14, X15,
                      X16, X17, X18, X19, X20, X21, X22, X23,
diff --git a/ChocolArm64/Translation/ILEmitterCtx.cs b/ChocolArm64/Translation/ILEmitterCtx.cs
index 6a1b916331..15e32644c3 100644
--- a/ChocolArm64/Translation/ILEmitterCtx.cs
+++ b/ChocolArm64/Translation/ILEmitterCtx.cs
@@ -125,7 +125,7 @@ namespace ChocolArm64.Translation
                 //after this one, then we have to return right now, with the address
                 //of the next instruction to be executed (in the case that the condition
                 //is false, and the branch was not taken, as all basic blocks should end with
-                //some kind of branch.
+                //some kind of branch).
                 if (CurrOp == CurrBlock.GetLastOp() && CurrBlock.Next == null)
                 {
                     EmitStoreState();