From 129deb27468e2234399a7e098dfbe013e149f9e6 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 28 Mar 2019 13:59:54 +1000
Subject: [PATCH] Extract local variables

---
 BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs | 8 ++++----
 BizHawk.Client.Common/movie/bkm/BkmHeader.cs            | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
index a5d24e7ff3..0ee9ad7fb6 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2LogEntryGenerator.cs
@@ -46,10 +46,10 @@ namespace BizHawk.Client.Common
 
 		public string GenerateLogKey()
 		{
-			var s = string.Join("#", _source.Definition.ControlsOrdered
-				.Select(group => string.Concat(group.Select(button => $"{button}|")))
-				.Where(groupStr => !string.IsNullOrEmpty(groupStr)));
-			return $"LogKey:{(s.Length > 0 ? $"#{s}" : string.Empty)}";
+			var groupStrings = _source.Definition.ControlsOrdered.Select(group =>
+				string.Concat(group.Select(button => $"{button}|")));
+			var s = $"#{string.Join("#", groupStrings.Where(groupStr => !string.IsNullOrEmpty(groupStr)))}";
+			return s.Length > 1 ? $"LogKey:{s}" : "LogKey:";
 		}
 
 		public Dictionary<string, string> Map()
diff --git a/BizHawk.Client.Common/movie/bkm/BkmHeader.cs b/BizHawk.Client.Common/movie/bkm/BkmHeader.cs
index 2988c12a19..3349516dec 100644
--- a/BizHawk.Client.Common/movie/bkm/BkmHeader.cs
+++ b/BizHawk.Client.Common/movie/bkm/BkmHeader.cs
@@ -152,9 +152,12 @@ namespace BizHawk.Client.Common
 			base.Clear();
 		}
 
-		public override string ToString() => string.Concat(this.Select((k, v) => $"{k} {v}\n"))
-			+ Subtitles
-			+ string.Join("\n", Comments) + "\n";
+		public override string ToString()
+		{
+			var body = string.Concat(this.Select((k, v) => $"{k} {v}\n"));
+			var comments = string.Join("\n", Comments);
+			return string.Concat(body, Subtitles, comments, "\n");
+		}
 
 		public bool ParseLineFromFile(string line)
 		{