diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.h b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.h
index 3bf7f7abd..a229a9a7f 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.h	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.h	
@@ -1,6 +1,16 @@
 class CDumpMemory :
 	public CDebugDialog<CDumpMemory>
 {
+public: 
+	enum { IDD = IDD_Cheats_DumpMemory };
+
+	CDumpMemory(CDebugger * debugger);
+	virtual ~CDumpMemory(void);
+
+private:
+	CDumpMemory(void);							// Disable default constructor
+	CDumpMemory(const CDumpMemory&);			// Disable copy constructor
+	CDumpMemory& operator=(const CDumpMemory&);	// Disable assignment
 
 	enum DumpFormat
 	{
@@ -10,43 +20,12 @@ class CDumpMemory :
 	BEGIN_MSG_MAP_EX(CDumpMemory)
 		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
 		COMMAND_CODE_HANDLER(BN_CLICKED,OnClicked)
-	END_MSG_MAP()
+		END_MSG_MAP()
 
-	LRESULT				OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+		LRESULT				OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT				OnClicked(WORD wNotifyCode, WORD wID, HWND /*hWndCtl*/, BOOL& bHandled);
-	
+
 	bool DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC, DWORD EndPC, DWORD DumpPC );
 
 	CEditNumber m_StartAddress, m_EndAddress, m_PC;
-	
-public: 
-	enum { IDD = IDD_Cheats_DumpMemory };
-
-	CDumpMemory(CDebugger * debugger);
-	virtual ~CDumpMemory(void);
-
-};
-//class CDumpMemory 
-//{
-//	enum DumpFormat
-//	{
-//		DisassemblyWithPC	
-//	};
-//	CMipsMemory * g_MMU;
-//	WND_HANDLE   m_Window;
-//	WORD SelStart, SelStop;
-//	static DWORD m_StartAddress;
-//	static DWORD m_EndAddress;
-//	
-//	bool DumpMemory(LPCSTR FileName,DumpFormat Format, DWORD StartPC, DWORD EndPC, DWORD DumpPC);
-//
-//	static DWORD AsciiToHex ( const char * HexValue );
-//	static int CALLBACK WinProc (WND_HANDLE hDlg,DWORD uMsg,DWORD wParam, DWORD lParam);
-//
-//
-//public: 
-//	CDumpMemory(CMipsMemory * MMU);
-//	~CDumpMemory(void);
-//
-//	void DisplayDump ( WND_HANDLE & hParent );
-//};
+};
\ No newline at end of file
diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h
index 9a26df599..2e22ab66b 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h	
@@ -1,20 +1,31 @@
 class CDebugMemorySearch :
 	public CDebugDialog<CDebugMemorySearch>
 {
+public: 
+	enum { IDD = IDD_Debugger_Search };
+
+	CDebugMemorySearch(CDebugger * debugger);
+	virtual ~CDebugMemorySearch(void);
+
+private:
+	CDebugMemorySearch(void);									// Disable default constructor
+	CDebugMemorySearch(const CDebugMemorySearch&);				// Disable copy constructor
+	CDebugMemorySearch& operator=(const CDebugMemorySearch&);	// Disable assignment
+
 	typedef struct {
 		DWORD PAddr;
 		DWORD Value;
 	} SearchResultItem;
-	
+
 	typedef std::vector<SearchResultItem> SearchResult;
-	
+
 	BEGIN_MSG_MAP_EX(CDebugMemorySearch)
 		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
 		COMMAND_CODE_HANDLER(BN_CLICKED,OnClicked)
 		NOTIFY_HANDLER_EX(IDC_LST_RESULTS,NM_RCLICK,OnResultRClick)
-	END_MSG_MAP()
+		END_MSG_MAP()
 
-	LRESULT				OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+		LRESULT				OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT				OnClicked(WORD wNotifyCode, WORD wID, HWND /*hWndCtl*/, BOOL& bHandled);
 	LRESULT             OnResultRClick ( LPNMHDR lpnmh );
 
@@ -23,24 +34,17 @@ class CDebugMemorySearch :
 	void EnableTextOptions    ( bool Enable );
 	void EnableJalOptions     ( bool Enable );
 	void AddAlignmentOptions  ( CComboBox  & ctrl );
-	
+
 	CEditNumber   m_PAddrStart, m_SearchLen, m_SearchValue, m_MaxSearch;
 	CComboBox     m_UnknownOptions, m_ValueSize, m_UnknownSize;
 	CListViewCtrl m_SearchResults;
 	SearchResult  m_SearchResult;
 	bool          m_HaveResults;
 	CN64System  * m_System;
-	
+
 	void FixUnknownOptions ( bool Reset );
 	void SearchForUnknown  ( void );
 	void SearchForValue    ( void );
 	void SearchForText     ( void );
 	void Reset             ( void );
-
-public: 
-	enum { IDD = IDD_Debugger_Search };
-
-	CDebugMemorySearch(CDebugger * debugger);
-	virtual ~CDebugMemorySearch(void);
-
 };