Rewrote some null checks.

Author: KN4CK3R

DataExchange/ReClassNetFile.Read.cs

@@ -214,10 +214,7 @@ public static Tuple<List<ClassNode>, List<BaseNode>> ReadNodes(Stream input, ReC
 
 			using (var project = new ReClassNetProject())
 			{
-				if (templateProject != null)
-				{
-					templateProject.Classes.ForEach(project.AddClass);
-				}
+				templateProject?.Classes.ForEach(project.AddClass);
 
 				var file = new ReClassNetFile(project);
 				file.Load(input, logger);

Debugger/HardwareBreakpoint.cs

@@ -73,13 +73,9 @@ public void Handler(ref DebugEvent evt)
 		public override bool Equals(object obj)
 		{
 			var hwbp = obj as HardwareBreakpoint;
-			if (hwbp == null)
-			{
-				return false;
-			}
 
 			// Two hardware breakpoints are equal if they use the same register.
-			return Register == hwbp.Register;
+			return hwbp?.Register == Register;
 		}
 
 		public override int GetHashCode()

Debugger/RemoteDebugger.Handler.cs

@@ -11,14 +11,11 @@ private void HandleExceptionEvent(ref DebugEvent evt)
 				foreach (var bp in breakpoints)
 				{
 					var hwbp = bp as HardwareBreakpoint;
-					if (hwbp != null)
+					if (hwbp?.Register == causedBy)
 					{
-						if (causedBy == hwbp.Register)
-						{
-							hwbp.Handler(ref evt);
+						hwbp.Handler(ref evt);
 
-							break;
-						}
+						break;
 					}
 				}
 			}

Debugger/RemoteDebugger.Thread.cs

@@ -107,10 +107,7 @@ private void Terminate(bool join)
 			{
 				lock (syncThread)
 				{
-					if (thread != null)
-					{
-						thread.Join();
-					}
+					thread?.Join();
 				}
 			}
 		}

Forms/FoundCodeForm.cs

@@ -184,16 +184,8 @@ private void closeButton_Click(object sender, EventArgs e)
 		private FoundCodeInfo GetSelectedInfo()
 		{
 			var row = foundCodeDataGridView.SelectedRows.Cast<DataGridViewRow>().FirstOrDefault();
-			if (row != null)
-			{
-				var view = row.DataBoundItem as DataRowView;
-				if (view != null)
-				{
-					return view["info"] as FoundCodeInfo;
-				}
-			}
-
-			return null;
+			var view = row?.DataBoundItem as DataRowView;
+			return view?["info"] as FoundCodeInfo;
 		}
 
 		private void StopRecording()

Forms/MainForm.cs

@@ -654,10 +654,7 @@ private void LoadFileFromPath(string filePath, ref ReClassNetProject project)
 					Program.Logger.Log(LogLevel.Error, $"The file '{filePath}' has an unknown type.");
 					break;
 			}
-			if (import != null)
-			{
-				import.Load(filePath, Program.Logger);
-			}
+			import?.Load(filePath, Program.Logger);
 		}
 
 		/// <summary>Loads all symbols for the current process and displays the progress status.</summary>

Forms/ProcessInfoForm.cs

@@ -254,21 +254,13 @@ private Control GetToolStripSourceControl(object sender)
 		private Module GetSelectedModule()
 		{
 			var row = modulesDataGridView.SelectedRows.Cast<DataGridViewRow>().FirstOrDefault()?.DataBoundItem as DataRowView;
-			if (row != null)
-			{
-				return row["module"] as Module;
-			}
-			return null;
+			return row?["module"] as Module;
 		}
 
 		private Section GetSelectedSection()
 		{
 			var row = sectionsDataGridView.SelectedRows.Cast<DataGridViewRow>().FirstOrDefault()?.DataBoundItem as DataRowView;
-			if (row != null)
-			{
-				return row["section"] as Section;
-			}
-			return null;
+			return row?["section"] as Section;
 		}
 	}
 }

Nodes/BaseHexCommentNode.cs

@@ -48,13 +48,10 @@ protected int AddComment(ViewInfo view, int x, int y, float fvalue, IntPtr ivalu
 					if (module != null)
 					{
 						var symbols = view.Memory.Process.Symbols.GetSymbolsForModule(module);
-						if (symbols != null)
+						var symbol = symbols?.GetSymbolString(ivalue, module);
+						if (!string.IsNullOrEmpty(symbol))
 						{
-							var symbol = symbols.GetSymbolString(ivalue, module);
-							if (!string.IsNullOrEmpty(symbol))
-							{
-								x = AddText(view, x, y, view.Settings.OffsetColor, HotSpot.ReadOnlyId, symbol) + view.Font.Width;
-							}
+							x = AddText(view, x, y, view.Settings.OffsetColor, HotSpot.ReadOnlyId, symbol) + view.Font.Width;
 						}
 					}
 				}

Symbols/SymbolStore.cs

@@ -96,18 +96,15 @@ private void ResolveSearchPath()
 					{
 						using (var debuggerKey = vsKey.OpenSubKey($@"{subKeyName}\Debugger"))
 						{
-							if (debuggerKey != null)
+							var symbolCacheDir = debuggerKey?.GetValue("SymbolCacheDir") as string;
+							if (symbolCacheDir != null)
 							{
-								var symbolCacheDir = debuggerKey.GetValue("SymbolCacheDir") as string;
-								if (symbolCacheDir != null)
+								if (Directory.Exists(symbolCacheDir))
 								{
-									if (Directory.Exists(symbolCacheDir))
-									{
-										SymbolCachePath = symbolCacheDir;
-									}
-
-									return;
+									SymbolCachePath = symbolCacheDir;
 								}
+
+								return;
 							}
 						}
 					}

UI/ClassNodeView.cs

@@ -282,10 +282,7 @@ private void deleteClassToolStripMenuItem_Click(object sender, EventArgs e)
 		private void renameClassToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			var treeNode = classesTreeView.SelectedNode;
-			if (treeNode != null)
-			{
-				treeNode.BeginEdit();
-			}
+			treeNode?.BeginEdit();
 		}
 
 		private void classesTreeView_AfterLabelEdit(object sender, NodeLabelEditEventArgs e)

UI/MemoryViewControl.cs

@@ -690,12 +690,8 @@ private void repaintTimer_Tick(object sender, EventArgs e)
 		private void editBox_Committed(object sender, EventArgs e)
 		{
 			var hotspotTextBox = sender as HotSpotTextBox;
-			if (hotspotTextBox == null)
-			{
-				return;
-			}
 
-			var hotSpot = hotspotTextBox.HotSpot;
+			var hotSpot = hotspotTextBox?.HotSpot;
 			if (hotSpot != null)
 			{
 				try