diff --git a/cplusplus/src/instructions/InstructionBase.cpp b/cplusplus/src/instructions/InstructionBase.cpp
index c79651fe..070636af 100644
--- a/cplusplus/src/instructions/InstructionBase.cpp
+++ b/cplusplus/src/instructions/InstructionBase.cpp
@@ -664,7 +664,6 @@ void InstructionBase::FlagSet_r5900UseDollar(TrinaryValue value) {
 
 /* flags */
 
-
 /* more getters */
 
 uint32_t InstructionBase::getRaw() const {
diff --git a/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Disassemble.c b/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Disassemble.c
index eb3f1983..783469b6 100644
--- a/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Disassemble.c
+++ b/src/instructions/RabbitizerInstruction/RabbitizerInstruction_Disassemble.c
@@ -114,11 +114,11 @@ bool RabbitizerInstruction_mustDisasmAsData(const RabbitizerInstruction *self) {
                     case RABBITIZER_INSTR_ID_cpu_cvt_w_s:
                         if (self->category == RABBITIZER_INSTRCAT_R5900) {
                             /**
-                             * Due to the R5900's FPU being non properly complaint, the instruction cvt.w.s always behaves as
-                             * trunc.w.s because EE can only do round-to-zero.
+                             * Due to the R5900's FPU being non properly complaint, the instruction cvt.w.s always
+                             * behaves as trunc.w.s because EE can only do round-to-zero.
                              *
-                             * Assemblers like GAS workaround this issue by decoding cvt.w.s as trunc.w.s, but other assemblers
-                             * just use trunc.w.s and cvt.w.s as-is.
+                             * Assemblers like GAS workaround this issue by decoding cvt.w.s as trunc.w.s, but other
+                             * assemblers just use trunc.w.s and cvt.w.s as-is.
                              *
                              * Here's some reading about the binutils rationale:
                              * - https://sourceware.org/legacy-ml/binutils/2012-11/msg00360.html
@@ -128,19 +128,19 @@ bool RabbitizerInstruction_mustDisasmAsData(const RabbitizerInstruction *self) {
                              * - trunc.w.s is built as the cvt.w.s instruction.
                              * - cvt.w.s errors complaining as not being supported by the processor.
                              *
-                             * To ensure the produced disassembly will still match when built with GAS, we decode this two
-                             * instructions as .word
+                             * To ensure the produced disassembly will still match when built with GAS, we decode this
+                             * two instructions as .word
                              */
                             return true;
                         }
                         break;
                     case RABBITIZER_INSTR_ID_r5900_vclipw:
-                        // The vclipw instruction has variants that are undocumented (vclipw.xy, vclipw.z) and don't assemble in
-                        // gnu as
+                        // The vclipw instruction has variants that are undocumented (vclipw.xy, vclipw.z) and don't
+                        // assemble in gnu as
                         return true;
                     case RABBITIZER_INSTR_ID_r5900_vsqrt:
-                        // The vclipw instruction seems to be representable in multiple ways, and we only disassemble one of
-                        // them
+                        // The vclipw instruction seems to be representable in multiple ways, and we only disassemble
+                        // one of them
                         return true;
 
                     default: