diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
index af811597b7..eb64f74597 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
@@ -127,22 +127,22 @@ namespace BizHawk.Client.Common
 		{
 			if (frame < FrameCount && frame >= 0)
 			{
-				int getframe;
+				int getFrame;
 
 				if (LoopOffset.HasValue)
 				{
 					if (frame < Log.Count)
 					{
-						getframe = frame;
+						getFrame = frame;
 					}
 					else
 					{
-						getframe = ((frame - LoopOffset.Value) % (Log.Count - LoopOffset.Value)) + LoopOffset.Value;
+						getFrame = ((frame - LoopOffset.Value) % (Log.Count - LoopOffset.Value)) + LoopOffset.Value;
 					}
 				}
 				else
 				{
-					getframe = frame;
+					getFrame = frame;
 				}
 
 				var adapter = new Bk2ControllerAdapter
@@ -150,7 +150,7 @@ namespace BizHawk.Client.Common
 					Definition = Global.MovieSession.MovieControllerAdapter.Definition
 				};
 
-				adapter.SetControllersAsMnemonic(Log[getframe]);
+				adapter.SetControllersAsMnemonic(Log[getFrame]);
 				return adapter;
 			}
 
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
index 41bd3de508..d03bb8c247 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
@@ -126,8 +126,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		// TODO: consider making this IEnumerable<int> instead of forcing the collection to be an array
-		public void RemoveFrames(int[] frames)
+		public void RemoveFrames(ICollection<int> frames)
 		{
 			if (frames.Any())
 			{
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index cd99ea0766..c9ca891f8c 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -151,9 +151,8 @@ namespace BizHawk.Client.Common
 
 				bl.GetLump(BinaryStateLump.Input, true, delegate(TextReader tr) // Note: ExtractInputLog will clear Lag and State data potentially, this must come before loading those
 				{
-					var errorMessage = "";
 					IsCountingRerecords = false;
-					ExtractInputLog(tr, out errorMessage);
+					ExtractInputLog(tr, out _);
 					IsCountingRerecords = true;
 				});
 
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index c7df946d72..4f56947df2 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -184,7 +184,7 @@ namespace BizHawk.Client.Common
 			_inputStateCache.Clear();
 		}
 
-		public string CreateDisplayValueForButton(IController adapter, string buttonName)
+		private string CreateDisplayValueForButton(IController adapter, string buttonName)
 		{
 			if (adapter.Definition.BoolButtons.Contains(buttonName))
 			{
@@ -555,11 +555,7 @@ namespace BizHawk.Client.Common
 		private bool _changes;
 		public override bool Changes
 		{
-			get
-			{
-				return _changes;
-			}
-
+			get => _changes;
 			protected set
 			{
 				if (_changes != value)