diff --git a/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Exceptions/DecodeFailure.hpp b/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Exceptions/DecodeFailure.hpp
index f6d8d572..70f24bdd 100644
--- a/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Exceptions/DecodeFailure.hpp
+++ b/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Exceptions/DecodeFailure.hpp
@@ -8,7 +8,7 @@
 
 namespace Targets::Microchip::Avr::Avr8Bit::OpcodeDecoder::Exceptions
 {
-class DecodeFailure: public ::Exceptions::Exception
+    class DecodeFailure: public ::Exceptions::Exception
     {
     public:
         Targets::TargetMemoryAddress byteAddress;
diff --git a/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Opcode.hpp b/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Opcode.hpp
index d8fa3777..521bc59e 100644
--- a/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Opcode.hpp
+++ b/src/Targets/Microchip/AVR/AVR8/OpcodeDecoder/Opcode.hpp
@@ -167,7 +167,8 @@ namespace Targets::Microchip::Avr::Avr8Bit::OpcodeDecoder
      * @tparam canChangeProgramFlow
      *  Whether the instruction **can** change program flow.
      *
-     *  If it can change the program counter to anything other than PC + 1, this should be set to true.
+     *  If the instruction can change the program counter to anything other than PC + n, where n is the word size of
+     *  the instruction, then this should be set to true.
      *
      * @tparam sourceRegisterParameter
      *  If the instruction encodes a source register parameter (like the OR instruction), this should be provided here.
@@ -476,7 +477,7 @@ namespace Targets::Microchip::Avr::Avr8Bit::OpcodeDecoder
 
         /**
          * We hold a single instance of the instruction name here, as a const static member, and then pass it by
-         * reference to any new instances of the OpcodeDecoder::Instruction struct (which holds a reference).
+         * reference to any new instances of the OpcodeDecoder::Instruction struct (which holds a const reference).
          */
         static const inline std::string name = instructionName.value;