diff --git a/BizHawk.Client.Common/cheats/SnesActionReplayDecoder.cs b/BizHawk.Client.Common/cheats/SnesActionReplayDecoder.cs
new file mode 100644
index 0000000000..b0f2ca300a
--- /dev/null
+++ b/BizHawk.Client.Common/cheats/SnesActionReplayDecoder.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Globalization;
+
+namespace BizHawk.Client.Common.cheats
+{
+	public class SnesActionReplayDecoder
+	{
+		private readonly string _code;
+
+		public SnesActionReplayDecoder(string code)
+		{
+			_code = code;
+			Decode();
+		}
+
+		public int Address { get; private set; }
+		public int Value { get; private set; }
+		public int ByteSize => 2;
+
+		// Sample Code:
+		// 7E18A428
+		// Address: 7E18A4
+		// Value: 28
+		public void Decode()
+		{
+			if (_code.Length != 8)
+			{
+				throw new InvalidOperationException("Pro Action Replay Codes need to be eight characters in length.");
+			}
+
+			Address = int.Parse(_code.Remove(6, 2), NumberStyles.HexNumber);
+			Value = int.Parse(_code.Remove(0, 6), NumberStyles.HexNumber);
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.cs b/BizHawk.Client.EmuHawk/tools/GameShark.cs
index 534593cbcf..ef7e0d9ee2 100644
--- a/BizHawk.Client.EmuHawk/tools/GameShark.cs
+++ b/BizHawk.Client.EmuHawk/tools/GameShark.cs
@@ -2600,52 +2600,20 @@ namespace BizHawk.Client.EmuHawk
 				////var watch = Watch.GenerateWatch(MemoryDomains["CARTROM"], decoder.Address, WatchSize.Byte, Common.DisplayType.Hex, false, txtDescription.Text);
 				////Global.CheatList.Add(new Cheat(watch, decoder.Value));
 			}
-
-			// This ONLY applies to Action Replay.
-			if (cheat.Length == 8)
+			else if (cheat.Length == 8)
 			{
-				// Sample Code:
-				// 7E18A428
-				// Address: 7E18A4
-				// Value: 28
-				// Remove last two octets
-				_ramAddress = _singleCheat.Remove(6, 2);
-
-				// Get RAM Value
-				_ramValue = _singleCheat.Remove(0, 6);
-
-				// Note, it's a Word.  However, we are using this to keep from repeating code.
-				_byteSize = 16;
+				var decoder = new SnesActionReplayDecoder(cheat);
+				var watch = Watch.GenerateWatch(MemoryDomains["System Bus"], decoder.Address, WatchSize.Word, Common.DisplayType.Hex, false, txtDescription.Text);
+				Global.CheatList.Add(new Cheat(watch, decoder.Value));
 			}
-
-			if (cheat.Contains("-") && cheat.Length != 9)
+			else if (cheat.Contains("-") && cheat.Length != 9)
 			{
 				MessageBox.Show("Game Genie Codes need to be nine characters in length.", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
-
-			if (cheat.Length != 9 && cheat.Length != 8)
+			else if (cheat.Length != 9 && cheat.Length != 8)
 			{
 				MessageBox.Show("Pro Action Replay Codes need to be eight characters in length.", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
-
-			try
-			{
-				// Action Replay
-				if (_byteSize == 16)
-				{
-					var watch = Watch.GenerateWatch(MemoryDomains["System Bus"], long.Parse(_ramAddress, NumberStyles.HexNumber), WatchSize.Word, Common.DisplayType.Hex, false, txtDescription.Text);
-					Global.CheatList.Add(new Cheat(watch, int.Parse(_ramValue, NumberStyles.HexNumber)));
-				}
-				else if (_byteSize == 8)
-				{
-					var watch = Watch.GenerateWatch(MemoryDomains["System Bus"], long.Parse(_ramAddress, NumberStyles.HexNumber), WatchSize.Byte, Common.DisplayType.Hex, false, txtDescription.Text);
-					Global.CheatList.Add(new Cheat(watch, int.Parse(_ramValue, NumberStyles.HexNumber)));
-				}
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show($"An Error occured: {ex.GetType()}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
 		}
 
 		private void BtnClear_Click(object sender, EventArgs e)