diff --git a/MC6809/inc/Disassembly.h b/MC6809/inc/Disassembly.h
index b60dcd9..4da60c8 100644
--- a/MC6809/inc/Disassembly.h
+++ b/MC6809/inc/Disassembly.h
@@ -6,7 +6,7 @@
 #include "mc6809.h"
 
 namespace EightBit {
-	class Disassembly {
+	class Disassembly final {
 	public:
 		Disassembly(mc6809& processor);
 
@@ -16,14 +16,6 @@ namespace EightBit {
 
 		std::string dumpState();
 
-		static std::string dump_Flags(uint8_t value);
-		static std::string dump_ByteValue(uint8_t value);
-		static std::string dump_RelativeValue(int8_t value);
-		static std::string dump_WordValue(uint16_t value);
-		static std::string dump_WordValue(register16_t value);
-		static std::string dump_RelativeValue(int16_t value);
-		static std::string dump_RelativeValue(register16_t value);
-
 	private:
 		mc6809& m_cpu;
 
@@ -32,6 +24,14 @@ namespace EightBit {
 		bool m_prefix10 = false;
 		bool m_prefix11 = false;
 
+		static std::string dump_Flags(uint8_t value);
+		static std::string dump_ByteValue(uint8_t value);
+		static std::string dump_RelativeValue(int8_t value);
+		static std::string dump_WordValue(uint16_t value);
+		static std::string dump_WordValue(register16_t value);
+		static std::string dump_RelativeValue(int16_t value);
+		static std::string dump_RelativeValue(register16_t value);
+
 		static void dump(std::ostream& out, int value, int width);
 
 		mc6809& CPU() { return m_cpu; }
diff --git a/MC6809/src/Disassembly.cpp b/MC6809/src/Disassembly.cpp
index 53b4ddd..1b02b76 100644
--- a/MC6809/src/Disassembly.cpp
+++ b/MC6809/src/Disassembly.cpp
@@ -66,7 +66,6 @@ std::string EightBit::Disassembly::dumpState() {
 
 	std::ostringstream output;
 
-	output << std::hex;
 	output << "PC=" << dump_WordValue(CPU().PC()) << ":";
 	output << "CC=" << dump_Flags(CPU().CC()) << ",";
 	output << "D=" << dump_WordValue(CPU().D()) << ",";
@@ -458,7 +457,7 @@ std::string EightBit::Disassembly::disassembleUnprefixed() {
 	case 0x13:	output << "\tSYNC";						break;		// SYNC (inherent)
 
 	// TFR
-	case 0x1f:	output << tfr("tfr");					break;		// TFR (immediate)
+	case 0x1f:	output << tfr("TFR");					break;		// TFR (immediate)
 
 	// TST
 	case 0x0d:	output << Address_direct("TST");		break;		// TST (direct)