diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..74cbe3c9d0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+[*.cs]
+
+# CS1584: XML comment has syntactically incorrect cref attribute
+dotnet_diagnostic.CS1584.severity = none
+
+# CS1041: expected identifier, invalid keyword
+dotnet_diagnostic.CS1041.severity = none
+
+# CS1658: Warning is overriding an error
+dotnet_diagnostic.CS1658.severity = none
+
+# IDE0079: Remove unnecessary suppression
+dotnet_diagnostic.IDE0079.severity = none
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs
index 25c11f4492..7e9c75ec09 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs
@@ -35,6 +35,8 @@ namespace Rubberduck.CodeAnalysis.Inspections.Concrete
     ///     value = otherVar * value
     /// End Sub
     /// ]]>
+    /// </module>
+    /// </example>
     /// <example hasResult="true">
     /// <module name="Module1" type="Standard Module">
     /// <![CDATA[
@@ -204,7 +206,7 @@ private static bool IsPotentiallyUsedViaJump(IdentifierReference resultCandidate
 
         private static bool IsPotentiallyUsedAssignment<T>(T jumpContext, IdentifierReference resultCandidate, Dictionary<string, int> labelIdLineNumberPairs) where T : ParserRuleContext
         {
-            int? executionBranchLine = null;
+            int? executionBranchLine;
 
             switch (jumpContext)
             {
@@ -219,9 +221,7 @@ private static bool IsPotentiallyUsedViaJump(IdentifierReference resultCandidate
                     break;
             }
 
-            return executionBranchLine.HasValue
-                ?   AssignmentIsUsedPriorToExitStmts(resultCandidate, executionBranchLine.Value)
-                :   false;
+            return executionBranchLine.HasValue && AssignmentIsUsedPriorToExitStmts(resultCandidate, executionBranchLine.Value);
         }
 
         private static bool AssignmentIsUsedPriorToExitStmts(IdentifierReference resultCandidate, int executionBranchLine)
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitActiveSheetReferenceInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitActiveSheetReferenceInspection.cs
index c9e2d34d6c..f7369c6930 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitActiveSheetReferenceInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitActiveSheetReferenceInspection.cs
@@ -9,11 +9,11 @@
 namespace Rubberduck.CodeAnalysis.Inspections.Concrete
 {
     /// <summary>
-    /// Locates unqualified Worksheet.Range/Cells/Columns/Rows member calls inside worksheet modules.
+    /// Locates unqualified Worksheet.Range/Cells/Columns/Rows member calls implicitly referring to ActiveSheet.
     /// </summary>
     /// <reference name="Excel" />
     /// <why>
-    /// Implicit references to the active worksheet rarely mean to be working with *whatever worksheet is currently active*. 
+    /// Implicit references to the active worksheet (ActiveSheet) rarely mean to be working with *whatever worksheet is currently active*. 
     /// By explicitly qualifying these member calls with a specific Worksheet object, the assumptions are removed, the code
     /// is more robust, and will be less likely to throw run-time error 1004 or produce unexpected results
     /// when the active sheet isn't the expected one.
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorkbookReferenceInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorkbookReferenceInspection.cs
index c96e2433c6..d66560d6ca 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorkbookReferenceInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorkbookReferenceInspection.cs
@@ -13,12 +13,12 @@
 namespace Rubberduck.CodeAnalysis.Inspections.Concrete
 {
     /// <summary>
-    /// Locates unqualified Workbook.Worksheets/Sheets/Names member calls inside workbook document modules that implicitly refer to the containing workbook.
+    /// Locates unqualified Workbook.Worksheets/Sheets/Names member calls inside workbook document modules, that implicitly refer to the host workbook.
     /// </summary>
-    /// <reference name="Excel" />
+    /// <hostApp name="Excel" />
     /// <why>
-    /// Implicit references inside a workbook document module can be mistakes for implicit references to the active workbook, which is the behavior in all other modules 
-    /// By explicitly qualifying these member calls with Me, the ambiguity can be resolved.
+    /// Implicit references inside a workbook document module can easily be mistaken for implicit references to the active workbook (ActiveWorkbook), which is the behavior in all other module types.
+    /// By explicitly qualifying these member calls with 'Me', the ambiguity can be resolved. If the intent is to actually refer to the active workbook, qualify with 'ActiveWorkbook' to prevent a bug.
     /// </why>
     /// <example hasResult="true">
     /// <module name="ThisWorkbook" type="Document Module">
@@ -40,7 +40,7 @@ namespace Rubberduck.CodeAnalysis.Inspections.Concrete
     /// ]]>
     /// </module>
     /// </example>
-    [RequiredLibrary("Excel")]
+    [RequiredHost("Excel")]
     internal sealed class ImplicitContainingWorkbookReferenceInspection : ImplicitWorkbookReferenceInspectionBase
     {
         public ImplicitContainingWorkbookReferenceInspection(IDeclarationFinderProvider declarationFinderProvider)
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorksheetReferenceInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorksheetReferenceInspection.cs
index 9f1df67391..d7e3e47a69 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorksheetReferenceInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitContainingWorksheetReferenceInspection.cs
@@ -10,12 +10,12 @@
 namespace Rubberduck.CodeAnalysis.Inspections.Concrete
 {
     /// <summary>
-    /// Locates unqualified Worksheet.Range/Cells/Columns/Rows member calls inside worksheet modules that implicitly refer to the containing sheet.
+    /// Locates unqualified Worksheet.Range/Cells/Columns/Rows member calls inside worksheet modules, that implicitly refer to the containing sheet component.
     /// </summary>
-    /// <reference name="Excel" />
+    /// <hostApp name="Excel" />
     /// <why>
-    /// Implicit references inside a worksheet document module can be mistakes for implicit references to the active worksheet, which is the behavior in all other places.
-    /// By explicitly qualifying these member calls with Me, the ambiguity can be resolved.
+    /// Implicit references inside a worksheet document module can easily be mistaken for implicit references to the active worksheet (ActiveSheet), which is the behavior in all other module types.
+    /// By explicitly qualifying these member calls with 'Me', the ambiguity can be resolved. If the intent is to refer to the active worksheet, qualify with 'ActiveSheet' to prevent a bug.
     /// </why>
     /// <example hasResult="true">
     /// <module name="Sheet1" type="Document Module">
@@ -37,7 +37,7 @@ namespace Rubberduck.CodeAnalysis.Inspections.Concrete
     /// ]]>
     /// </module>
     /// </example>
-    [RequiredLibrary("Excel")]
+    [RequiredHost("Excel")]
     internal sealed class ImplicitContainingWorksheetReferenceInspection : ImplicitSheetReferenceInspectionBase
     {
         public ImplicitContainingWorksheetReferenceInspection(IDeclarationFinderProvider declarationFinderProvider)
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/InvalidAnnotationInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/InvalidAnnotationInspection.cs
index 2c86270f0f..9b53d9ab4c 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/InvalidAnnotationInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/InvalidAnnotationInspection.cs
@@ -222,7 +222,7 @@ public InvalidAnnotationInspection(IDeclarationFinderProvider declarationFinderP
         {
             return GetUnboundAnnotations(annotations, userDeclarations, identifierReferences)
                 .Where(pta => !pta.Annotation.Target.HasFlag(AnnotationTarget.General) || pta.AnnotatedLine == null)
-                .Concat(AttributeAnnotationsOnDeclarationsNotAllowingAttributes(annotations, userDeclarations, identifierReferences))
+                .Concat(AttributeAnnotationsOnDeclarationsNotAllowingAttributes(userDeclarations))
                 .ToList();
         }
 
@@ -241,10 +241,7 @@ public InvalidAnnotationInspection(IDeclarationFinderProvider declarationFinderP
                 .Where(pta => pta.Annotation.GetType() != typeof(NotRecognizedAnnotation) && !boundAnnotationsSelections.Contains(pta.QualifiedSelection));
         }
 
-        private IEnumerable<IParseTreeAnnotation> AttributeAnnotationsOnDeclarationsNotAllowingAttributes(
-            IEnumerable<IParseTreeAnnotation> annotations,
-            IEnumerable<Declaration> userDeclarations,
-            IEnumerable<IdentifierReference> identifierReferences)
+        private IEnumerable<IParseTreeAnnotation> AttributeAnnotationsOnDeclarationsNotAllowingAttributes(IEnumerable<Declaration> userDeclarations)
         {
             return userDeclarations
                 .Where(declaration => declaration.AttributesPassContext == null
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/SheetAccessedUsingStringInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/SheetAccessedUsingStringInspection.cs
index 8e0c3fdbc6..e4db4f955b 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/SheetAccessedUsingStringInspection.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/SheetAccessedUsingStringInspection.cs
@@ -193,8 +193,7 @@ private static VBAParser.LiteralExpressionContext SheetNameArgumentLiteralExpres
         private string CodeNameOfVBComponentMatchingSheetName(string projectId, string sheetName)
         {
             var components = _projectsProvider.Components(projectId);
-
-            foreach (var (module, component) in components)
+            foreach (var (_, component) in components)
             {
                 if (component.Type != ComponentType.Document)
                 {
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/FilterLimits.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/FilterLimits.cs
index 7189b0e467..a384df2ec7 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/FilterLimits.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/FilterLimits.cs
@@ -36,9 +36,9 @@ internal struct Limit<T> where T : IComparable<T>
 
         public static bool operator !=(Limit<T> LHS, Limit<T> RHS) => !(LHS == RHS);
 
-        public static bool operator >(Limit<T> LHS, T RHS) => LHS.HasValue ? LHS.Value.CompareTo(RHS) > 0 : false;
+        public static bool operator >(Limit<T> LHS, T RHS) => LHS.HasValue && LHS.Value.CompareTo(RHS) > 0;
 
-        public static bool operator <(Limit<T> LHS, T RHS) => LHS.HasValue? LHS.Value.CompareTo(RHS) < 0 : false;
+        public static bool operator <(Limit<T> LHS, T RHS) => LHS.HasValue && LHS.Value.CompareTo(RHS) < 0;
 
         public static bool operator >=(Limit<T> LHS, Limit<T> RHS) => LHS == RHS || LHS > RHS;
 
@@ -106,7 +106,7 @@ public void SetExtents(T min, T max)
 
         public bool SetMinimum(T min)
         {
-            var setNewValue = false;
+            bool setNewValue;
             if (_min.HasValue)
             {
                 setNewValue = min.CompareTo(_min.Value) > 0;
@@ -123,7 +123,7 @@ public bool SetMinimum(T min)
 
         public bool SetMaximum(T max)
         {
-            var setNewValue = false;
+            bool setNewValue;
             if (_max.HasValue)
             {
                 setNewValue = max.CompareTo(_max.Value) < 0;
@@ -195,6 +195,8 @@ public override bool Equals(object obj)
             return true;
         }
 
+        public override int GetHashCode() => VBEditor.HashCode.Compute(Minimum, Maximum);
+
         public override string ToString()
         {
             var minString = string.Empty;
@@ -202,13 +204,13 @@ public override string ToString()
             if (_min.HasValue)
             {
                 minString = MinimumExtent.HasValue && _min == MinimumExtent
-                    ? $"Min(typeMin)" : $"Min({_min.ToString()})";
+                    ? $"Min(typeMin)" : $"Min({_min})";
             }
 
             if (_max.HasValue)
             {
                 maxString = MaximumExtent.HasValue && _max == MaximumExtent
-                    ? $"Max(typeMax)" : $"Max({_max.ToString()})";
+                    ? $"Max(typeMax)" : $"Max({_max})";
             }
             return $"{minString}{maxString}";
         }
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/UnreachableCaseInspector.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/UnreachableCaseInspector.cs
index 552c84d3c0..5d1d30ca61 100644
--- a/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/UnreachableCaseInspector.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/UnreachableCaseInspector.cs
@@ -225,7 +225,7 @@ private string GetBaseTypeForDeclaration(Declaration declaration)
             VBAParser.SelectCaseStmtContext selectStmt,
             IParseTreeVisitorResults parseTreeValues)
         {
-            var (typeName, value) = SelectExpressionTypeNameAndValue(selectStmt, parseTreeValues);
+            var (typeName, _) = SelectExpressionTypeNameAndValue(selectStmt, parseTreeValues);
             return typeName;
         }
 
diff --git a/Rubberduck.CodeAnalysis/QuickFixes/Concrete/ExpandBangNotationQuickFix.cs b/Rubberduck.CodeAnalysis/QuickFixes/Concrete/ExpandBangNotationQuickFix.cs
index 69edb13884..418ccbdedf 100644
--- a/Rubberduck.CodeAnalysis/QuickFixes/Concrete/ExpandBangNotationQuickFix.cs
+++ b/Rubberduck.CodeAnalysis/QuickFixes/Concrete/ExpandBangNotationQuickFix.cs
@@ -132,8 +132,8 @@ public override string Description(IInspectionResult result)
         public override bool CanFixInProject => true;
         public override bool CanFixAll => true;
 
-        private string NonIdentifierCharacters = "[](){}\r\n\t.,'\"\\ |!@#$%^&*-+:=; ";
-        private string AdditionalNonFirstIdentifierCharacters = "0123456789_";
+        private readonly string NonIdentifierCharacters = "[](){}\r\n\t.,'\"\\ |!@#$%^&*-+:=; ";
+        private readonly string AdditionalNonFirstIdentifierCharacters = "0123456789_";
 
         private static readonly Dictionary<string, string> DefaultMemberOverrides = new Dictionary<string, string>
         {
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs
index a105850106..95dfd89bbf 100644
--- a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs
+++ b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerMemberViewModel.cs
@@ -51,7 +51,7 @@ public override string NameWithSignature
         }
 
         public override bool IsObsolete =>
-            Declaration.Annotations.Any(annotation => annotation is ObsoleteAnnotation);
+            Declaration.Annotations.Any(pta => pta.Annotation is ObsoleteAnnotation);
 
         public static readonly DeclarationType[] SubMemberTypes =
         {
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
index e6073f476d..8270aa709f 100644
--- a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
+++ b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -39,13 +39,15 @@ public enum CodeExplorerSortOrder
     public sealed class CodeExplorerViewModel : ViewModelBase
     {
         // ReSharper disable NotAccessedField.Local - The settings providers aren't used, but several enhancement requests will need them.
+#pragma warning disable IDE0052 // Remove unread private members
         private readonly RubberduckParserState _state;
         private readonly RemoveCommand _externalRemoveCommand;
-        private readonly IConfigurationService<GeneralSettings> _generalSettingsProvider;      
+        private readonly IConfigurationService<GeneralSettings> _generalSettingsProvider;
         private readonly IConfigurationService<WindowSettings> _windowSettingsProvider;
         private readonly IUiDispatcher _uiDispatcher;
         private readonly IVBE _vbe;
         private readonly ITemplateProvider _templateProvider;
+#pragma warning restore IDE0052 // Remove unread private members
         // ReSharper restore NotAccessedField.Local
 
         public CodeExplorerViewModel(
@@ -77,6 +79,8 @@ public sealed class CodeExplorerViewModel : ViewModelBase
             CollapseAllSubnodesCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteCollapseNodes, EvaluateCanSwitchNodeState);
             ExpandAllSubnodesCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteExpandNodes, EvaluateCanSwitchNodeState);
             ClearSearchCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteClearSearchCommand);
+            CollapseAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteCollapseAllCommand);
+            ExpandAllCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteExpandAllCommand);
             if (_externalRemoveCommand != null)
             {
                 RemoveCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRemoveCommand, _externalRemoveCommand.CanExecute);
@@ -92,7 +96,9 @@ public sealed class CodeExplorerViewModel : ViewModelBase
 
         public ObservableCollection<ICodeExplorerNode> Projects { get; } = new ObservableCollection<ICodeExplorerNode>();
 
+#pragma warning disable IDE1006 // Naming Styles
         private ObservableCollection<Template> templates => _templateProvider.GetTemplates();
+#pragma warning restore IDE1006 // Naming Styles
 
         public ObservableCollection<Template> BuiltInTemplates =>
             new ObservableCollection<Template>(templates.Where(t => !t.IsUserDefined)
@@ -345,6 +351,22 @@ private void ExecuteClearSearchCommand(object parameter)
             }
         }
 
+        private void ExecuteCollapseAllCommand(object parameter)
+        {
+            foreach (var project in Projects)
+            {
+                ExecuteCollapseNodes(project);
+            }
+        }
+
+        private void ExecuteExpandAllCommand(object parameter)
+        {
+            foreach (var project in Projects)
+            {
+                ExecuteExpandNodes(project);
+            }
+        }
+
         private bool EvaluateCanSwitchNodeState(object parameter)
         {
             return SelectedItem?.Children?.Any() ?? false;
@@ -420,7 +442,10 @@ private void ExecuteRemoveCommand(object param)
 
         public CodeExplorerMoveToFolderDragAndDropCommand MoveToFolderDragAndDropCommand { get; set; }
 
-    public ICodeExplorerNode FindVisibleNodeForDeclaration(Declaration declaration)
+        public CommandBase CollapseAllCommand { get; }
+        public CommandBase ExpandAllCommand { get; }
+
+        public ICodeExplorerNode FindVisibleNodeForDeclaration(Declaration declaration)
         {
             if (declaration == null)
             {
diff --git a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodModel.cs b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodModel.cs
index 755e89949b..161a01af3e 100644
--- a/Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodModel.cs
+++ b/Rubberduck.Core/Refactorings/ExtractMethod/ExtractMethodModel.cs
@@ -60,14 +60,15 @@ public static class IEnumerableExt
 
     public class ExtractMethodModel : IExtractMethodModel
     {
-        private List<Declaration> _extractDeclarations;
-        private IExtractMethodParameterClassification _paramClassify;
-        private IExtractedMethod _extractedMethod;
+        private readonly List<Declaration> _extractDeclarations = new List<Declaration>();
+        private readonly IExtractMethodParameterClassification _paramClassify;
+        private readonly IExtractedMethod _extractedMethod;
 
         public ExtractMethodModel(IExtractedMethod extractedMethod, IExtractMethodParameterClassification paramClassify)
         {
             _extractedMethod = extractedMethod;
             _paramClassify = paramClassify;
+            _sourceMember = null;
         }
 
         public void extract(IEnumerable<Declaration> declarations, QualifiedSelection selection, string selectedCode)
@@ -101,7 +102,7 @@ public void extract(IEnumerable<Declaration> declarations, QualifiedSelection se
             }
             _declarationsToMove = _paramClassify.DeclarationsToMove.ToList();
 
-            _rowsToRemove = splitSelection(selection.Selection, _declarationsToMove).ToList();
+            _rowsToRemove = SplitSelection(selection.Selection, _declarationsToMove).ToList();
 
             var methodCallPositionStartLine = selectionStartLine - _declarationsToMove.Count(d => d.Selection.StartLine < selectionStartLine);
             _positionForMethodCall = new Selection(methodCallPositionStartLine, 1, methodCallPositionStartLine, 1);
@@ -136,7 +137,7 @@ private static Declaration FindSelectedDeclaration(IEnumerable<Declaration> decl
             return declaration;
         }
 
-        public IEnumerable<Selection> splitSelection(Selection selection, IEnumerable<Declaration> declarations)
+        public IEnumerable<Selection> SplitSelection(Selection selection, IEnumerable<Declaration> declarations)
         {
             var tupleList = new List<Tuple<int, int>>();
             var declarationRows = declarations
@@ -152,7 +153,7 @@ public IEnumerable<Selection> splitSelection(Selection selection, IEnumerable<De
             return returnList;
         }
 
-        private Declaration _sourceMember;
+        private readonly Declaration _sourceMember;
         public Declaration SourceMember { get { return _sourceMember; } }
 
         private QualifiedSelection _selection;
@@ -161,15 +162,15 @@ public IEnumerable<Selection> splitSelection(Selection selection, IEnumerable<De
         private string _selectedCode;
         public string SelectedCode { get { return _selectedCode; } }
 
-        private List<Declaration> _locals;
+        private readonly List<Declaration> _locals = new List<Declaration>();
         public IEnumerable<Declaration> Locals { get { return _locals; } }
 
-        private IEnumerable<ExtractedParameter> _input;
+        private readonly IEnumerable<ExtractedParameter> _input = new List<ExtractedParameter>();
         public IEnumerable<ExtractedParameter> Inputs { get { return _input; } }
-        private IEnumerable<ExtractedParameter> _output;
+        private readonly IEnumerable<ExtractedParameter> _output = new List<ExtractedParameter>();
         public IEnumerable<ExtractedParameter> Outputs { get { return _output; } }
 
-        private List<Declaration> _declarationsToMove;
+        private List<Declaration> _declarationsToMove = new List<Declaration>();
         public IEnumerable<Declaration> DeclarationsToMove { get { return _declarationsToMove; } }
 
         public IExtractedMethod Method { get { return _extractedMethod; } }
@@ -181,7 +182,8 @@ public IEnumerable<Selection> splitSelection(Selection selection, IEnumerable<De
 
         private Selection _positionForNewMethod;
         public Selection PositionForNewMethod { get { return _positionForNewMethod; } }
-        IList<Selection> _rowsToRemove;
+        
+        private IList<Selection> _rowsToRemove;
         public IEnumerable<Selection> RowsToRemove
         {
             // we need to split selectionToRemove around any declarations that
diff --git a/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml b/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml
index 8c9edba14c..a13f146922 100644
--- a/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml
+++ b/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml
@@ -21,7 +21,7 @@
             </ResourceDictionary.MergedDictionaries>
 
             <CollectionViewSource x:Key="BuiltInTemplatesViewSource" x:Name="BuiltInTemplatesView" Source="{Binding BuiltInTemplates}" />
-            <CollectionViewSource x:Key="UserDefinedTemplatesViewSource" x:Name="BuiltInTemplatesView" Source="{Binding UserDefinedTemplates}" />
+            <CollectionViewSource x:Key="UserDefinedTemplatesViewSource" x:Name="UserDefinedTemplatesView" Source="{Binding UserDefinedTemplates}" />
             <CollectionViewSource x:Key="AnnotationsViewSource" x:Name="AnnotationsView" Source="{Binding Annotations}" />
 
             <BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
@@ -47,6 +47,8 @@
             <BitmapImage x:Key="SyncImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/SyncArrows.png" />
             <BitmapImage x:Key="FontSizeImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/edit-size.png" />
             <BitmapImage x:Key="ExtractInterfaceImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ExtractInterface.png" />
+            <BitmapImage x:Key="CollapseAllImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/collapse-all.png" />
+            <BitmapImage x:Key="ExpandAllImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/expand-all.png" />
 
             <converters:BooleanToNullableDoubleConverter x:Key="BoolToDouble" />
             <converters:TemplateCommandParameterToTupleConverter x:Key="TemplateCommandParameterToTuple" />
@@ -381,6 +383,19 @@
                         </i:Interaction.Behaviors>
                     </MenuItem>
                 </Menu>
+
+                <Separator />
+
+                <Button Name="CollapseAll" Command="{Binding CollapseAllCommand}" Margin="2"
+                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_CollapseAll}">
+                    <Image Source="{StaticResource CollapseAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
+                </Button>
+                
+                <Button Name="ExpandAll" Command="{Binding ExpandAllCommand}" Margin="2"
+                        ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=InspectionResults_ExpandAll}">
+                    <Image Source="{StaticResource ExpandAllImage}" Style="{StaticResource ToolbarImageOpacity}" />
+                </Button>
+                
             </ToolBar>
         </ToolBarTray>
 
diff --git a/Rubberduck.Core/UI/Command/RunSelectedTestModuleCommand.cs b/Rubberduck.Core/UI/Command/RunSelectedTestModuleCommand.cs
index 367d5975ab..5d02405946 100644
--- a/Rubberduck.Core/UI/Command/RunSelectedTestModuleCommand.cs
+++ b/Rubberduck.Core/UI/Command/RunSelectedTestModuleCommand.cs
@@ -23,7 +23,7 @@ private bool SpecialEvaluateCanExecute(object parameter)
         {
             return (parameter ?? FindModuleFromSelection()) is Declaration candidate &&
                    candidate.DeclarationType == DeclarationType.ProceduralModule &&
-                   candidate.Annotations.Any(annotation => annotation.Annotation is TestModuleAnnotation) &&
+                   candidate.Annotations.Any(pta => pta.Annotation is TestModuleAnnotation) &&
                    _engine.CanRun &&
                    _engine.Tests.Any(test => test.Declaration.QualifiedModuleName.Equals(candidate.QualifiedModuleName));
         }
@@ -32,7 +32,7 @@ protected override void OnExecute(object parameter)
         {
             if (!((parameter ?? FindModuleFromSelection()) is Declaration candidate) ||
                 candidate.DeclarationType != DeclarationType.ProceduralModule ||
-                !candidate.Annotations.Any(annotation => annotation.Annotation is TestModuleAnnotation) ||
+                !candidate.Annotations.Any(pta => pta.Annotation is TestModuleAnnotation) ||
                 !_engine.CanRun)
             {
                 return;
diff --git a/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs b/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
index 3921542d5d..5362bcd856 100644
--- a/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/ExtractMethodDialog.cs
@@ -17,6 +17,7 @@ public partial class ExtractMethodDialog : Form, IExtractMethodDialog
     {
         public ExtractMethodDialog()
         {
+            _returnValue = null;
             _parameters = new BindingList<ExtractedParameter>();
 
             InitializeComponent();
@@ -154,7 +155,7 @@ public string Preview
         private BindingList<ExtractedParameter> _parameters;
         public IEnumerable<ExtractedParameter> Parameters
         {
-            get { return _parameters.Where(p => p.Name != _returnValue.Name); }
+            get { return _parameters.Where(p => p.Name != _returnValue?.Name); }
             set
             {
                 _parameters = new BindingList<ExtractedParameter>(value.ToList());
@@ -170,11 +171,11 @@ public IEnumerable<ExtractedParameter> ReturnValues
             set
             {
                 _returnValues = new BindingList<ExtractedParameter>(value.ToList());
-                var items = _returnValues.ToArray();
+                //var items = _returnValues.ToArray();
             }
         }
 
-        private ExtractedParameter _returnValue;
+        private readonly ExtractedParameter _returnValue;
 
         public IEnumerable<ExtractedParameter> Inputs { get; set; }
         public IEnumerable<ExtractedParameter> Outputs { get; set; }
diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs b/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs
index 49d776aa06..1aac5a4368 100644
--- a/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs
+++ b/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs
@@ -54,7 +54,9 @@ internal sealed class TestExplorerViewModel : ViewModelBase, INavigateSelection,
             TestExplorerModel model,
             IClipboardWriter clipboard,
             // ReSharper disable once UnusedParameter.Local - left in place because it will likely be needed for app wide font settings, etc.
+#pragma warning disable IDE0060 // Remove unused parameter
             IConfigurationService<Configuration> configService,
+#pragma warning restore IDE0060 // Remove unused parameter
             ISettingsFormFactory settingsFormFactory,
             IRewritingManager rewritingManager,
             IAnnotationUpdater annotationUpdater)
diff --git a/Rubberduck.Main/ComClientLibrary/UnitTesting/FakeBase.cs b/Rubberduck.Main/ComClientLibrary/UnitTesting/FakeBase.cs
index 991b06d7e1..db628abc2a 100644
--- a/Rubberduck.Main/ComClientLibrary/UnitTesting/FakeBase.cs
+++ b/Rubberduck.Main/ComClientLibrary/UnitTesting/FakeBase.cs
@@ -61,7 +61,7 @@ protected bool TrySetReturnValue(bool any = false)
             var returnInfo =
                 ReturnValues.Where(r => r.Invocation == (any ? FakesProvider.AllInvocations : (int) InvocationCount) &&
                                    r.Argument != null &&
-                                   r.Argument == string.Empty).ToList();
+                                   string.IsNullOrWhiteSpace(r.Argument.ToString())).ToList();
 
             if (returnInfo.Count <= 0)
             {
diff --git a/Rubberduck.Parsing/Annotations/Concrete/MemberAttributeAnnotation.cs b/Rubberduck.Parsing/Annotations/Concrete/MemberAttributeAnnotation.cs
index 0418c071c2..ccee8c0949 100644
--- a/Rubberduck.Parsing/Annotations/Concrete/MemberAttributeAnnotation.cs
+++ b/Rubberduck.Parsing/Annotations/Concrete/MemberAttributeAnnotation.cs
@@ -59,7 +59,7 @@ public MemberAttributeAnnotation()
         public override IReadOnlyList<ComponentType> IncompatibleComponentTypes => _incompatibleComponentTypes;
             
 
-        private static AnnotationArgumentType[] _argumentTypes = new[]
+        private static readonly AnnotationArgumentType[] _argumentTypes = new[]
         {
             AnnotationArgumentType.Attribute,
             AnnotationArgumentType.Text | AnnotationArgumentType.Number | AnnotationArgumentType.Boolean
diff --git a/Rubberduck.Parsing/Annotations/Concrete/ModuleAttributeAnnotation.cs b/Rubberduck.Parsing/Annotations/Concrete/ModuleAttributeAnnotation.cs
index a286786a77..37a3c2c473 100644
--- a/Rubberduck.Parsing/Annotations/Concrete/ModuleAttributeAnnotation.cs
+++ b/Rubberduck.Parsing/Annotations/Concrete/ModuleAttributeAnnotation.cs
@@ -54,7 +54,7 @@ public ModuleAttributeAnnotation()
         private readonly IReadOnlyList<ComponentType> _incompatibleComponentTypes;
         public override IReadOnlyList<ComponentType> IncompatibleComponentTypes => _incompatibleComponentTypes;
 
-        private static AnnotationArgumentType[] _argumentTypes = new[]
+        private static readonly AnnotationArgumentType[] _argumentTypes = new[]
         {
             AnnotationArgumentType.Attribute,
             AnnotationArgumentType.Text | AnnotationArgumentType.Number | AnnotationArgumentType.Boolean
diff --git a/Rubberduck.Parsing/ComReflection/ComProject.cs b/Rubberduck.Parsing/ComReflection/ComProject.cs
index fd1a184e4a..095433c1a9 100644
--- a/Rubberduck.Parsing/ComReflection/ComProject.cs
+++ b/Rubberduck.Parsing/ComReflection/ComProject.cs
@@ -34,30 +34,32 @@ public class ComProject : ComBase
 
         // YGNI...
         // ReSharper disable once NotAccessedField.Local
+#pragma warning disable IDE0052 // Remove unread private members
         private readonly TypeLibTypeFlags _flags;
+#pragma warning restore IDE0052 // Remove unread private members
 
         [DataMember(IsRequired = true)]
-        private List<ComAlias> _aliases = new List<ComAlias>();
+        private readonly List<ComAlias> _aliases = new List<ComAlias>();
         public IEnumerable<ComAlias> Aliases => _aliases;
 
         [DataMember(IsRequired = true)]
-        private List<ComInterface> _interfaces = new List<ComInterface>();
+        private readonly List<ComInterface> _interfaces = new List<ComInterface>();
         public IEnumerable<ComInterface> Interfaces => _interfaces;
 
         [DataMember(IsRequired = true)]
-        private List<ComEnumeration> _enumerations = new List<ComEnumeration>();
+        private readonly List<ComEnumeration> _enumerations = new List<ComEnumeration>();
         public IEnumerable<ComEnumeration> Enumerations => _enumerations;
 
         [DataMember(IsRequired = true)]
-        private List<ComCoClass> _classes = new List<ComCoClass>();
+        private readonly List<ComCoClass> _classes = new List<ComCoClass>();
         public IEnumerable<ComCoClass> CoClasses => _classes;
 
         [DataMember(IsRequired = true)]
-        private List<ComModule> _modules = new List<ComModule>();
+        private readonly List<ComModule> _modules = new List<ComModule>();
         public IEnumerable<ComModule> Modules => _modules;
 
         [DataMember(IsRequired = true)]
-        private List<ComStruct> _structs = new List<ComStruct>();
+        private readonly List<ComStruct> _structs = new List<ComStruct>();
         public IEnumerable<ComStruct> Structs => _structs;
 
         //Note - Enums and Types should enumerate *last*. That will prevent a duplicate module in the unlikely(?)
diff --git a/Rubberduck.Parsing/Rubberduck.Parsing.csproj b/Rubberduck.Parsing/Rubberduck.Parsing.csproj
index 27a1ec1c9f..a639d965e8 100644
--- a/Rubberduck.Parsing/Rubberduck.Parsing.csproj
+++ b/Rubberduck.Parsing/Rubberduck.Parsing.csproj
@@ -35,6 +35,9 @@
       <CustomToolNamespace>Rubberduck.Parsing.PreProcessing</CustomToolNamespace>
     </Antlr4>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rubberduck.InternalApi\Rubberduck.InternalApi.csproj" />
     <ProjectReference Include="..\Rubberduck.SettingsProvider\Rubberduck.SettingsProvider.csproj" />
diff --git a/Rubberduck.Parsing/UIContext/IUiDispatcher.cs b/Rubberduck.Parsing/UIContext/IUiDispatcher.cs
index 0bfe10becb..7ecac9d496 100644
--- a/Rubberduck.Parsing/UIContext/IUiDispatcher.cs
+++ b/Rubberduck.Parsing/UIContext/IUiDispatcher.cs
@@ -1,4 +1,5 @@
-using System;
+using Rubberduck.VBEditor.Utility;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -19,7 +20,7 @@ public interface IUiDispatcher
         /// on the UI thread's dispatcher and executed asynchronously.
         /// <para>For additional operations on the UI thread, you can get a
         /// reference to the UI thread's context thanks to the property
-        /// <see cref="UiContext" /></para>.
+        /// <see cref="UiContextProvider" /></para>.
         /// </summary>
         /// <param name="action">The action that will be executed on the UI
         /// thread</param>
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
index 564a488c8c..1d2b1d7703 100644
--- a/Rubberduck.Parsing/VBA/RubberduckParserState.cs
+++ b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -119,30 +119,10 @@ public sealed class RubberduckParserState : IDisposable, IDeclarationFinderProvi
         [SuppressMessage("ReSharper", "JoinNullCheckWithUsage")]
         public RubberduckParserState(IVBE vbe, IProjectsRepository projectRepository, IDeclarationFinderFactory declarationFinderFactory, IVbeEvents vbeEvents)
         {
-            if (vbe == null)
-            {
-                throw new ArgumentNullException(nameof(vbe));
-            }
-
-            if (projectRepository == null)
-            {
-                throw new ArgumentException(nameof(projectRepository));
-            }
-
-            if (declarationFinderFactory == null)
-            {
-                throw new ArgumentNullException(nameof(declarationFinderFactory)); 
-            }
-
-            if (vbeEvents == null)
-            {
-                throw new ArgumentNullException(nameof(vbeEvents));
-            }
-
-            _vbe = vbe;
-            _projectRepository = projectRepository;
-            _declarationFinderFactory = declarationFinderFactory;
-            _vbeEvents = vbeEvents;
+            _vbe = vbe ?? throw new ArgumentNullException(nameof(vbe));
+            _projectRepository = projectRepository ?? throw new ArgumentException(nameof(projectRepository));
+            _declarationFinderFactory = declarationFinderFactory ?? throw new ArgumentNullException(nameof(declarationFinderFactory));
+            _vbeEvents = vbeEvents ?? throw new ArgumentNullException(nameof(vbeEvents));
             
             var values = Enum.GetValues(typeof(ParserState));
             foreach (var value in values)
@@ -167,10 +147,7 @@ private void RefreshFinder(IHostApplication host)
             _declarationFinderFactory.Release(oldDeclarationFinder);
         }
 
-        public void RefreshDeclarationFinder()
-        {
-            RefreshFinder(_hostApp);
-        }
+        public void RefreshDeclarationFinder() => RefreshFinder(_hostApp);
 
         #region Event Handling
 
@@ -324,15 +301,12 @@ public void OnStatusMessageUpdate(string message)
         /// were projects with duplicate ID's to clear the old
         /// declarations referencing the project by the old ID.
         /// </summary>
-        public void RefreshProjects()
-        {
-            _projectRepository.Refresh();
-        }
+        public void RefreshProjects() => _projectRepository.Refresh();
+        
 
         private void RefreshProject(string projectId)
         {
             _projectRepository.Refresh(projectId);
-
             ClearStateCache(projectId);
         }
 
@@ -456,10 +430,8 @@ public void SetModuleState(QualifiedModuleName module, ParserState state, Cancel
             }
         }
 
-        private IVBProject GetProject(string projectId)
-        {
-            return _projectRepository.Project(projectId);
-        }
+        private IVBProject GetProject(string projectId) => _projectRepository.Project(projectId);
+        
 
         public void EvaluateParserState(CancellationToken token)
         {
@@ -657,10 +629,9 @@ public List<CommentNode> AllComments
             }
         }
 
-        public void SetModuleComments(QualifiedModuleName module, IEnumerable<CommentNode> comments)
-        {
+        public void SetModuleComments(QualifiedModuleName module, IEnumerable<CommentNode> comments) =>
             _moduleStates[module].SetComments(new List<CommentNode>(comments));
-        }
+        
 
         public IReadOnlyCollection<CommentNode> GetModuleComments(QualifiedModuleName module)
         {
@@ -723,10 +694,8 @@ private IReadOnlyList<Declaration> AllDeclarationsFromModuleStates
             }
         }
 
-        private bool ThereAreDeclarations()
-        {
-            return _moduleStates.Values.Any(state => state.Declarations != null && state.Declarations.Any());
-        }
+        private bool ThereAreDeclarations() => _moduleStates.Values.Any(state => state.Declarations != null && state.Declarations.Any());
+        
 
         /// <summary>
         /// Gets a copy of the failed resolution stores directly from the module states. (Used for refreshing the DeclarationFinder.)
@@ -954,7 +923,7 @@ public ITokenStream GetAttributesTokenStream(QualifiedModuleName qualifiedModule
         }
 
         /// <summary>
-        /// Removes the specified <see cref="declaration"/> from the collection.
+        /// Removes the specified <see cref="Declaration"/> from the collection.
         /// </summary>
         /// <param name="declaration"></param>
         /// <returns>Returns true when successful.</returns>
diff --git a/Rubberduck.Refactorings/Common/ParseTreeValue/ComparableDateValue.cs b/Rubberduck.Refactorings/Common/ParseTreeValue/ComparableDateValue.cs
index d7c9a6d2ad..89a5a323a6 100644
--- a/Rubberduck.Refactorings/Common/ParseTreeValue/ComparableDateValue.cs
+++ b/Rubberduck.Refactorings/Common/ParseTreeValue/ComparableDateValue.cs
@@ -97,7 +97,7 @@ public static bool TryParse(string valueText, out ComparableDateValue value)
             {
                 return false;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 //even though a SyntaxErrorException/InputMismatchException is thrown, 
                 //this catch-all block seems to be needed(?)
diff --git a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx
index 44e866e623..cb4f62e5ef 100644
--- a/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx
+++ b/Rubberduck.Resources/CodeExplorer/CodeExplorerUI.fr.resx
@@ -328,4 +328,7 @@ Continuer?</value>
   <data name="CodeExplorer_MoveToFolder" xml:space="preserve">
     <value>Déplacer vers le dossier...</value>
   </data>
+  <data name="CodeExplorer_AppendHeader" xml:space="preserve">
+    <value>Rubberduck: Déclarations - {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Inspections/InspectionInfo.Designer.cs b/Rubberduck.Resources/Inspections/InspectionInfo.Designer.cs
index e130dc868b..6e9f41b892 100644
--- a/Rubberduck.Resources/Inspections/InspectionInfo.Designer.cs
+++ b/Rubberduck.Resources/Inspections/InspectionInfo.Designer.cs
@@ -358,7 +358,7 @@ public class InspectionInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Implicit references to workbook members inside a workbook document module can be mistakes for implicit references to the active workbook, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved..
+        ///   Looks up a localized string similar to Implicit references to workbook members inside a workbook document module can be mistaken for implicit references to the active workbook, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved. If the intent was to refer to the active workbook, qualify with &apos;ActiveWorkbook&apos; to prevent a bug..
         /// </summary>
         public static string ImplicitContainingWorkbookReferenceInspection {
             get {
@@ -367,7 +367,7 @@ public class InspectionInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Implicit references to worksheet members inside a worksheet document module can be mistakes for implicit references to the active worksheet, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved..
+        ///   Looks up a localized string similar to Implicit references to worksheet members inside a worksheet document module can be mistaken for implicit references to the active worksheet, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved. If the intent is to refer to the active worksheet, qualify with &apos;ActiveSheet&apos; to prevent a bug..
         /// </summary>
         public static string ImplicitContainingWorksheetReferenceInspection {
             get {
@@ -466,7 +466,7 @@ public class InspectionInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The annotation could not be bound to a target. An annotation meant to be specified at module level cannot be used to annotate members; conversely, annotations meant to be annotate members cannot be used at module level..
+        ///   Looks up a localized string similar to The annotation could not be bound to a target. Is the annotation misplaced? An annotation meant to be specified at module level cannot be used to annotate members; conversely, annotations meant to be annotate members cannot be used at module level..
         /// </summary>
         public static string InvalidAnnotationInspection {
             get {
@@ -529,7 +529,7 @@ public class InspectionInfo {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The last parameter (the &apos;Value&apos; parameter) of property mutators are always passed ByVal. This is true regardless of the presence or absence of a ByRef or ByVal modifier. Exception: A UserDefinedType must always be passed ByRef even when it is the last parameter of a property mutator..
+        ///   Looks up a localized string similar to The last parameter (the &apos;Value&apos; parameter) of property mutators (Let/Set) are always passed ByVal. This is true regardless of the presence or absence of a ByRef or ByVal modifier. Exception: A UserDefinedType must always be passed ByRef even when it is the last parameter of a property mutator..
         /// </summary>
         public static string MisleadingByRefParameterInspection {
             get {
diff --git a/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx b/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx
index 365b24306e..0867838af4 100644
--- a/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionInfo.fr.resx
@@ -442,4 +442,22 @@ Si le paramètre peut être nul, ignorer ce résultat; passer une valeur nulle 
   <data name="SuperfluousAnnotationArgumentInspection" xml:space="preserve">
     <value>Une annotation a plus d'arguments que permis; les arguments superflus seront ignorés.</value>
   </data>
+  <data name="AnnotationInIncompatibleComponentTypeInspection" xml:space="preserve">
+    <value>Une annotation est spécifiée dans un module d'un type qui n'est pas compatible avec cette annotation. Certaines annotations peuvent seulement être utilisées dans certains types de modules.</value>
+  </data>
+  <data name="ImplicitContainingWorkbookReferenceInspection" xml:space="preserve">
+    <value>Les références implicites au classeur hôte dans un module de type 'Workbook' sont faciles à méprendre pour des références implicites au classeur actif (ActiveWorkbook). Qualifier l'appel avec 'Me' enlève cette ambiguité. Si l'intention est de référencer le classeur actif, qualifier avec 'ActiveWorkbook' pour prévenir un bogue.</value>
+  </data>
+  <data name="ImplicitContainingWorksheetReferenceInspection" xml:space="preserve">
+    <value>Les références implicites à la feuille hôte dans ce même module peuvent facilement être méprises pour des références à la feuille active (ActiveSheet). Qualifier l'appel avec 'Me' enlève l'ambiguité. Si l'intention est de référer à la feuille active, qualifier l'appel avec 'ActiveSheet' pour prévenir un bogue.</value>
+  </data>
+  <data name="InvalidAnnotationInspection" xml:space="preserve">
+    <value>L'annotation n'a pu être liée à une cible. Une annotation ciblant un module ne peut être utilisée pour une méthode; une annotation destinée à un membre ne peut être utilisée pour un module.</value>
+  </data>
+  <data name="MisleadingByRefParameterInspection" xml:space="preserve">
+    <value>Le dernier paramètre ('Value' ou 'RHS') d'un membre Property Let ou Property Set est toujours passé par valeur (ByVal), et ce même en présence d'un modificateur ByRef, implicite ou explicite (sauf pour un type UDT).</value>
+  </data>
+  <data name="UnrecognizedAnnotationInspection" xml:space="preserve">
+    <value>Un commentaire correspond à la syntaxe pour une annotation valide, mais ne correspond à aucunne annotation supportée.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Inspections/InspectionInfo.resx b/Rubberduck.Resources/Inspections/InspectionInfo.resx
index 413df9990e..45faa26478 100644
--- a/Rubberduck.Resources/Inspections/InspectionInfo.resx
+++ b/Rubberduck.Resources/Inspections/InspectionInfo.resx
@@ -248,7 +248,7 @@ If the parameter can be null, ignore this inspection result; passing a null valu
     <value>This is the default setting, it does not need to be specified.</value>
   </data>
   <data name="InvalidAnnotationInspection" xml:space="preserve">
-    <value>The annotation could not be bound to a target. An annotation meant to be specified at module level cannot be used to annotate members; conversely, annotations meant to be annotate members cannot be used at module level.</value>
+    <value>The annotation could not be bound to a target. Is the annotation misplaced? An annotation meant to be specified at module level cannot be used to annotate members; conversely, annotations meant to be annotate members cannot be used at module level.</value>
   </data>
   <data name="MissingAttributeInspection" xml:space="preserve">
     <value>A Rubberduck annotation is specified for a module or member, but the corresponding attribute isn't present. Module attributes and annotations need to be synchronized.</value>
@@ -443,13 +443,13 @@ If the parameter can be null, ignore this inspection result; passing a null valu
     <value>An annotation has more arguments than allowed; superfluous arguments are ignored.</value>
   </data>
   <data name="ImplicitContainingWorkbookReferenceInspection" xml:space="preserve">
-    <value>Implicit references to workbook members inside a workbook document module can be mistakes for implicit references to the active workbook, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved.</value>
+    <value>Implicit references to workbook members inside a workbook document module can be mistaken for implicit references to the active workbook, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved. If the intent was to refer to the active workbook, qualify with 'ActiveWorkbook' to prevent a bug.</value>
   </data>
   <data name="ImplicitContainingWorksheetReferenceInspection" xml:space="preserve">
-    <value>Implicit references to worksheet members inside a worksheet document module can be mistakes for implicit references to the active worksheet, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved.</value>
+    <value>Implicit references to worksheet members inside a worksheet document module can be mistaken for implicit references to the active worksheet, which is the behavior in all other modules. By explicitly qualifying these member calls with Me, the ambiguity can be resolved. If the intent is to refer to the active worksheet, qualify with 'ActiveSheet' to prevent a bug.</value>
   </data>
   <data name="MisleadingByRefParameterInspection" xml:space="preserve">
-    <value>The last parameter (the 'Value' parameter) of property mutators are always passed ByVal. This is true regardless of the presence or absence of a ByRef or ByVal modifier. Exception: A UserDefinedType must always be passed ByRef even when it is the last parameter of a property mutator.</value>
+    <value>The last parameter (the 'Value' parameter) of property mutators (Let/Set) are always passed ByVal. This is true regardless of the presence or absence of a ByRef or ByVal modifier. Exception: A UserDefinedType must always be passed ByRef even when it is the last parameter of a property mutator.</value>
   </data>
   <data name="AnnotationInIncompatibleComponentTypeInspection" xml:space="preserve">
     <value>An annotation was specified in a module type that isn't compatible with that annotation. Some annotations can only be used in a specific module type; others cannot be used in certain module types.</value>
diff --git a/Rubberduck.Resources/Inspections/InspectionNames.fr.resx b/Rubberduck.Resources/Inspections/InspectionNames.fr.resx
index 5179c5f8c9..2617702aea 100644
--- a/Rubberduck.Resources/Inspections/InspectionNames.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionNames.fr.resx
@@ -438,4 +438,22 @@
   <data name="SuperfluousAnnotationArgumentInspection" xml:space="preserve">
     <value>Arguments d'annotation superflus</value>
   </data>
+  <data name="AnnotationInIncompatibleComponentTypeInspection" xml:space="preserve">
+    <value>Annotation dans un type de composant incompatible</value>
+  </data>
+  <data name="ImplicitContainingWorkbookReferenceInspection" xml:space="preserve">
+    <value>Référence implicite au classeur contenant le projet</value>
+  </data>
+  <data name="ImplicitContainingWorksheetReferenceInspection" xml:space="preserve">
+    <value>Référence implicite à la feuille (Worksheet) hôte</value>
+  </data>
+  <data name="InvalidAnnotationInspection" xml:space="preserve">
+    <value>Annotation invalide</value>
+  </data>
+  <data name="MisleadingByRefParameterInspection" xml:space="preserve">
+    <value>Modificateur ByRef trompeur</value>
+  </data>
+  <data name="UnrecognizedAnnotationInspection" xml:space="preserve">
+    <value>Annotation inconnue</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Inspections/InspectionResults.fr.resx b/Rubberduck.Resources/Inspections/InspectionResults.fr.resx
index c62cb6754b..1bc35ed2b7 100644
--- a/Rubberduck.Resources/Inspections/InspectionResults.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionResults.fr.resx
@@ -468,4 +468,25 @@ In memoriam, 1972-2018</value>
   <data name="SuperfluousAnnotationArgumentInspection" xml:space="preserve">
     <value>L'annotation '{0}' demande moins d'arguments que ce qui est spécifié.</value>
   </data>
+  <data name="ImplicitContainingWorkbookReferenceInspection" xml:space="preserve">
+    <value>Le membre '{0}' référencie implicitement le classeur contenant le projet.</value>
+  </data>
+  <data name="ImplicitContainingWorksheetReferenceInspection" xml:space="preserve">
+    <value>Le membre '{0}' référencie implicitement la feuille hôte.</value>
+  </data>
+  <data name="InvalidAnnotationInspection" xml:space="preserve">
+    <value>Annotation '{0}' invalide dans ce contexte.</value>
+  </data>
+  <data name="InvalidAnnotationInspection_IncompatibleComponentType" xml:space="preserve">
+    <value>L'annotation '{0}' ne peut être utilisée dans un '{1}'.</value>
+  </data>
+  <data name="InvalidAnnotationInspection_NotInRequiredComponentType" xml:space="preserve">
+    <value>L'annotation '{0}' est utilisée dans un '{1}', mais n'est seulement valide dans un '{2}'.</value>
+  </data>
+  <data name="MisleadingByRefParameterInspection" xml:space="preserve">
+    <value>Modificateur ByRef trompeur pour le paramètre '{0}' ({1}).</value>
+  </data>
+  <data name="UnrecognizedAnnotationInspection" xml:space="preserve">
+    <value>'{0}' n'est pas [encore?] une annotation que Rubberduck reconnaît</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Inspections/QuickFixes.fr.resx b/Rubberduck.Resources/Inspections/QuickFixes.fr.resx
index f0867d6e39..b8ec79e98b 100644
--- a/Rubberduck.Resources/Inspections/QuickFixes.fr.resx
+++ b/Rubberduck.Resources/Inspections/QuickFixes.fr.resx
@@ -303,4 +303,10 @@
   <data name="AnnotateEntryPointQuickFix" xml:space="preserve">
     <value>Annoter avec @EntryPoint</value>
   </data>
+  <data name="DeclareAsExplicitTypeQuickFix" xml:space="preserve">
+    <value>Déclarer un type explicite</value>
+  </data>
+  <data name="QualifyWithMeQuickFix" xml:space="preserve">
+    <value>Qualifier la référence avec 'Me'.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs b/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs
index 13afc1c9d0..c9c5b7521f 100644
--- a/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs
+++ b/Rubberduck.Resources/Menus/RubberduckMenus.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.Menus {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class RubberduckMenus {
diff --git a/Rubberduck.Resources/Menus/RubberduckMenus.fr.resx b/Rubberduck.Resources/Menus/RubberduckMenus.fr.resx
index 42d6267bb5..1698df03ee 100644
--- a/Rubberduck.Resources/Menus/RubberduckMenus.fr.resx
+++ b/Rubberduck.Resources/Menus/RubberduckMenus.fr.resx
@@ -264,4 +264,10 @@
   <data name="RubberduckMenu_CodePaneRefactor" xml:space="preserve">
     <value>&amp;Refactorer</value>
   </data>
+  <data name="ProjectExplorer_IgnoreProject" xml:space="preserve">
+    <value>Ignorer ce Projet</value>
+  </data>
+  <data name="ProjectExplorer_UnignoreProject" xml:space="preserve">
+    <value>Inclure ce Projet</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Refactorings/Refactorings.cs.resx b/Rubberduck.Resources/Refactorings/Refactorings.cs.resx
index 1b5b05673a..144493612e 100644
--- a/Rubberduck.Resources/Refactorings/Refactorings.cs.resx
+++ b/Rubberduck.Resources/Refactorings/Refactorings.cs.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="CodeBuilder_DefaultPropertyRHSParamFormat" xml:space="preserve">
-    <value>{0}Hodnota</value>
-  </data>
   <data name="ImplementInterface_TODO" xml:space="preserve">
     <value>'TODO implementovat člena rozhraní</value>
   </data>
diff --git a/Rubberduck.Resources/Rubberduck.Resources.csproj b/Rubberduck.Resources/Rubberduck.Resources.csproj
index 1d1ae891d0..2db46473a6 100644
--- a/Rubberduck.Resources/Rubberduck.Resources.csproj
+++ b/Rubberduck.Resources/Rubberduck.Resources.csproj
@@ -27,6 +27,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="CodeExplorer\CodeExplorerUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Update="Inspections\InspectionInfo.Designer.cs">
       <DesignTime>True</DesignTime>
     </Compile>
@@ -39,8 +42,23 @@
     <Compile Update="Inspections\QuickFixes.Designer.cs">
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Update="Menus\RubberduckMenus.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Update="Refactorings\Refactorings.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Update="RubberduckUI.Designer.cs">
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Update="Settings\SettingsUI.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Update="Templates.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Update="UnitTesting\TestExplorer.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Rubberduck.Resources/RubberduckUI.cs.resx b/Rubberduck.Resources/RubberduckUI.cs.resx
index 771a072495..ee64892ff2 100644
--- a/Rubberduck.Resources/RubberduckUI.cs.resx
+++ b/Rubberduck.Resources/RubberduckUI.cs.resx
@@ -1452,9 +1452,6 @@ Import přerušen.</value>
   <data name="ComponentType_UserControl" xml:space="preserve">
     <value>Uživatelský Control</value>
   </data>
-  <data name="CodeExplorer_IExportable_DeclarationFormat" xml:space="preserve">
-    <value>{0} {1} {2} {3} {4} {5}</value>
-  </data>
   <data name="EncapsulateField_PreviewMarker" xml:space="preserve">
     <value>'&lt;===== Změny v deklaraci a vlastnostech nad tímto řádkem =====&gt;</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.fr.resx b/Rubberduck.Resources/RubberduckUI.fr.resx
index 593faee54d..d69e18c546 100644
--- a/Rubberduck.Resources/RubberduckUI.fr.resx
+++ b/Rubberduck.Resources/RubberduckUI.fr.resx
@@ -475,7 +475,7 @@ Attention: les valeurs personnalisées seront perdues.    Le fichier original se
     <value>Suivant</value>
   </data>
   <data name="RenamePresenter_TargetIsInterfaceMemberImplementation" xml:space="preserve">
-    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier l'interface? (cette modification serait propagée à toutes les implémentations)</value>
+    <value>La méthode '{0}' implémente '{1}.{2}'. Modifier l'interface (cette modification serait propagée à toutes les implémentations)?</value>
     <comment>0: Selected target; 1: Interface name; 2: Interface member name</comment>
   </data>
   <data name="OK_AllCaps" xml:space="preserve">
@@ -1346,13 +1346,13 @@ NOTE: Un redémarrage de l'application sera requis pour que la nouvelle configur
     <value>La sélection ne semble pas contenir de déclaration utilisable.</value>
   </data>
   <data name="RefactoringFailure_TargetNull" xml:space="preserve">
-    <value>La déclaration ciblée est 'null', ...poof?</value>
+    <value>La déclaration ciblée est 'null'.</value>
   </data>
   <data name="RenameFailure_TargetModuleWithoutCodeModule" xml:space="preserve">
-    <value>Le module ciblé '{0}' n'est plus trouvable!</value>
+    <value>Le module ciblé '{0}' n'est plus trouvable.</value>
   </data>
   <data name="RenameFailure_StandardEventHandler" xml:space="preserve">
-    <value>La cible '{0}' est une procédure gestionnaire d'événements, impossible de renommer cette pocédure sans briser quelque chose!</value>
+    <value>La cible '{0}' est une procédure gestionnaire d'événements, impossible de renommer cette pocédure sans briser quelque chose.</value>
   </data>
   <data name="RefactoringFailure_TargetNotUserDefined" xml:space="preserve">
     <value>La cible n'est pas définie par l'utilisateur.</value>
@@ -1625,4 +1625,88 @@ Procéder?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Renommer le dossier</value>
   </data>
+  <data name="AnnotationArgumentType_Attribute" xml:space="preserve">
+    <value>Attribut</value>
+  </data>
+  <data name="AnnotationArgumentType_Boolean" xml:space="preserve">
+    <value>Valeur Booléenne</value>
+  </data>
+  <data name="AnnotationArgumentType_Inspection" xml:space="preserve">
+    <value>Nom d'inspection</value>
+  </data>
+  <data name="AnnotationArgumentType_Number" xml:space="preserve">
+    <value>Nombre</value>
+  </data>
+  <data name="AnnotationArgumentType_Text" xml:space="preserve">
+    <value>Texte</value>
+  </data>
+  <data name="ComponentType_StandardModule" xml:space="preserve">
+    <value>Module standard</value>
+  </data>
+  <data name="ComponentType_ClassModule" xml:space="preserve">
+    <value>Module de classe</value>
+  </data>
+  <data name="ComponentType_ComComponent" xml:space="preserve">
+    <value>Componsant COM</value>
+  </data>
+  <data name="ComponentType_Document" xml:space="preserve">
+    <value>Module document</value>
+  </data>
+  <data name="ComponentType_DocObject" xml:space="preserve">
+    <value>Objet document</value>
+  </data>
+  <data name="ComponentType_MDIForm" xml:space="preserve">
+    <value>Formulaire MDI</value>
+  </data>
+  <data name="ComponentType_PropPage" xml:space="preserve">
+    <value>Page de propriétés</value>
+  </data>
+  <data name="ComponentType_RelatedDocument" xml:space="preserve">
+    <value>Document associé</value>
+  </data>
+  <data name="ComponentType_ResFile" xml:space="preserve">
+    <value>Fichier de resources</value>
+  </data>
+  <data name="ComponentType_Undefined" xml:space="preserve">
+    <value>Non défini</value>
+  </data>
+  <data name="ComponentType_UserControl" xml:space="preserve">
+    <value>Contrôle utilisateur</value>
+  </data>
+  <data name="ComponentType_UserForm" xml:space="preserve">
+    <value>Formulaire</value>
+  </data>
+  <data name="ComponentType_VBForm" xml:space="preserve">
+    <value>Formulaire VB</value>
+  </data>
+  <data name="ComponentType_ActiveXDesigner" xml:space="preserve">
+    <value>Concepteur ActiveX</value>
+  </data>
+  <data name="DeclarationType_Document" xml:space="preserve">
+    <value>le document</value>
+  </data>
+  <data name="EncapsulateField_PrivateUDTPropertyText" xml:space="preserve">
+    <value>Crée une propriété pour chaque membre du type UDT</value>
+  </data>
+  <data name="ExtractInterface_ImplementationOptionsGroupBox" xml:space="preserve">
+    <value>Options d'implémentation:</value>
+  </data>
+  <data name="ExtractInterface_OptionAddEmptyImplementation" xml:space="preserve">
+    <value>Ajouter implémentation vide</value>
+  </data>
+  <data name="ExtractInterface_OptionForwardToInterfaceMembers" xml:space="preserve">
+    <value>Les membres appellent l'implémentation</value>
+  </data>
+  <data name="ExtractInterface_OptionForwardToObjectMembers" xml:space="preserve">
+    <value>L'implémentation appelle les membres</value>
+  </data>
+  <data name="ExtractInterface_OptionReplaceMembersWithInterfaceMembers" xml:space="preserve">
+    <value>Remplacer les membres par l'implémentation</value>
+  </data>
+  <data name="IndenterSettings_GroupRelatedProperties" xml:space="preserve">
+    <value>Supprime l'espacement vertical entre les membres d'une même propriété</value>
+  </data>
+  <data name="TestOutcome_Ignored" xml:space="preserve">
+    <value>Ignoré</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Settings/SettingsUI.Designer.cs b/Rubberduck.Resources/Settings/SettingsUI.Designer.cs
index c2c9542682..af887d1f70 100644
--- a/Rubberduck.Resources/Settings/SettingsUI.Designer.cs
+++ b/Rubberduck.Resources/Settings/SettingsUI.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.Settings {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class SettingsUI {
diff --git a/Rubberduck.Resources/Settings/SettingsUI.fr.resx b/Rubberduck.Resources/Settings/SettingsUI.fr.resx
index f7f9e3aa64..26af6bbba2 100644
--- a/Rubberduck.Resources/Settings/SettingsUI.fr.resx
+++ b/Rubberduck.Resources/Settings/SettingsUI.fr.resx
@@ -231,4 +231,10 @@
   <data name="HotKeys_Exclamation" xml:space="preserve">
     <value>Pas de modificateur?!</value>
   </data>
+  <data name="FilesHeader_IgnoredProjectsSettings" xml:space="preserve">
+    <value>Fichiers ignorés</value>
+  </data>
+  <data name="PageHeader_IgnoredProjectsSettings" xml:space="preserve">
+    <value>Projets Ignorés</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Templates.Designer.cs b/Rubberduck.Resources/Templates.Designer.cs
index 1e82d07137..a7d1347430 100644
--- a/Rubberduck.Resources/Templates.Designer.cs
+++ b/Rubberduck.Resources/Templates.Designer.cs
@@ -70,7 +70,7 @@ public class Templates {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cannot find the template for &apos;{0}&apos;. The file may have been renamed or deleted. Expected file name: &apos;{1}&apos;.
+        ///   Looks up a localized string similar to Cannot find the template for &apos;{0}&apos;. The file may have been renamed or deleted. Expected file name: &apos;{1}&apos;..
         /// </summary>
         public static string Menu_Warning_CannotFindTemplate_Message {
             get {
diff --git a/Rubberduck.Resources/Templates.de.resx b/Rubberduck.Resources/Templates.de.resx
index 606f9c8bc8..361334729f 100644
--- a/Rubberduck.Resources/Templates.de.resx
+++ b/Rubberduck.Resources/Templates.de.resx
@@ -130,6 +130,6 @@
     <value>Fehlende Vorlagendatei</value>
   </data>
   <data name="Menu_Warning_CannotFindTemplate_Message" xml:space="preserve">
-    <value>Die Vorlage '{0}' konnte nicht gefunden werden. Die Datei wurde vielleicht umbenannt oder gelöscht. Der erwartete Dateiname ist: '{1}'</value>
+    <value>Die Vorlage '{0}' konnte nicht gefunden werden. Die Datei wurde vielleicht umbenannt oder gelöscht. Der erwartete Dateiname ist: '{1}'.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Templates.fr.resx b/Rubberduck.Resources/Templates.fr.resx
index ad2fbb1ed9..ee3027661f 100644
--- a/Rubberduck.Resources/Templates.fr.resx
+++ b/Rubberduck.Resources/Templates.fr.resx
@@ -126,4 +126,10 @@
   <data name="PredeclaredClassModule_Name" xml:space="preserve">
     <value>PreclaredClassModule</value>
   </data>
-</root>
+  <data name="Menu_Warning_CannotFindTemplate_Caption" xml:space="preserve">
+    <value>Fichier gabarit manquant</value>
+  </data>
+  <data name="Menu_Warning_CannotFindTemplate_Message" xml:space="preserve">
+    <value>Impossible de trouver le gabarit pour '{0}'. Le fichier '{1}' peut avoir été déplacé, renommé, ou supprimé.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Rubberduck.Resources/Templates.resx b/Rubberduck.Resources/Templates.resx
index 6b7411f865..3fb9d767b7 100644
--- a/Rubberduck.Resources/Templates.resx
+++ b/Rubberduck.Resources/Templates.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Menu_Warning_CannotFindTemplate_Message" xml:space="preserve">
-    <value>Cannot find the template for '{0}'. The file may have been renamed or deleted. Expected file name: '{1}'</value>
+    <value>Cannot find the template for '{0}'. The file may have been renamed or deleted. Expected file name: '{1}'.</value>
   </data>
   <data name="Menu_Warning_CannotFindTemplate_Caption" xml:space="preserve">
     <value>Missing Template File</value>
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs b/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
index 2fb2719c58..882014f0e2 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs
@@ -19,7 +19,7 @@ namespace Rubberduck.Resources.UnitTesting {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class TestExplorer {
diff --git a/Rubberduck.Resources/UnitTesting/TestExplorer.resx b/Rubberduck.Resources/UnitTesting/TestExplorer.resx
index d10301a83a..b8144da09a 100644
--- a/Rubberduck.Resources/UnitTesting/TestExplorer.resx
+++ b/Rubberduck.Resources/UnitTesting/TestExplorer.resx
@@ -270,7 +270,7 @@
   </data>
   <data name="UnitTest_NewMethod_BaseName" xml:space="preserve">
     <value>TestMethod</value>
-    <comment>As it "Sub TestMethod1()". Also appended to the end of Stub tests - i.e "Sub FooTestMethod()".   Localize as an indentifier.</comment>
+    <comment>As in "Sub TestMethod1()". Also appended to the end of Stub tests - i.e "Sub FooTestMethod()".   Localize as an indentifier.</comment>
   </data>
   <data name="UnitTest_NewMethod_ExpectedError" xml:space="preserve">
     <value>ExpectedError</value>
diff --git a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoFunction.cs b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoFunction.cs
index 7f905443f5..d294fd2fef 100644
--- a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoFunction.cs
+++ b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoFunction.cs
@@ -21,6 +21,6 @@ public interface ITypeInfoFunction : IDisposable
         string Name { get; }
         int ParamCount { get; }
         PROCKIND ProcKind { get; }
-        void Dispose();
+        //void Dispose();
     }
 }
\ No newline at end of file
diff --git a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoVariable.cs b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoVariable.cs
index 63bbdf7038..1362744ddd 100644
--- a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoVariable.cs
+++ b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoVariable.cs
@@ -8,6 +8,6 @@ public interface ITypeInfoVariable : IDisposable
         string Name { get; }
         int MemberID { get; }
         VARFLAGS MemberFlags { get; }
-        void Dispose();
+        //void Dispose();
     }
 }
\ No newline at end of file
diff --git a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoWrapper.cs b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoWrapper.cs
index 4172422963..54aba926a4 100644
--- a/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoWrapper.cs
+++ b/Rubberduck.VBEEditor/ComManagement/TypeLibs/Abstract/ITypeInfoWrapper.cs
@@ -23,7 +23,7 @@ public interface ITypeInfoWrapper : ITypeInfo, IDisposable
         System.Runtime.InteropServices.ComTypes.TYPEFLAGS Flags { get; }
         string ContainerName { get; }
         ITypeInfoVBEExtensions VBEExtensions { get; }
-        void Dispose();
+        //void Dispose();
         int GetSafeRefTypeInfo(int hRef, out ITypeInfoWrapper outTI);
         IntPtr GetCOMReferencePtr();
         int GetContainingTypeLib(IntPtr ppTLB, IntPtr pIndex);
@@ -37,14 +37,14 @@ public interface ITypeInfoWrapper : ITypeInfo, IDisposable
         int GetIDsOfNames(IntPtr rgszNames, int cNames, IntPtr pMemId);
         int Invoke(IntPtr pvInstance, int memid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr);
         int GetDocumentation(int memid, IntPtr strName, IntPtr strDocString, IntPtr dwHelpContext, IntPtr strHelpFile);
-        int GetDllEntry(int memid, System.Runtime.InteropServices.ComTypes.INVOKEKIND invKind, IntPtr pBstrDllName, IntPtr pBstrName, IntPtr pwOrdinal);
+        new int GetDllEntry(int memid, System.Runtime.InteropServices.ComTypes.INVOKEKIND invKind, IntPtr pBstrDllName, IntPtr pBstrName, IntPtr pwOrdinal);
         int GetRefTypeInfo(int hRef, IntPtr ppTI);
         int AddressOfMember(int memid, System.Runtime.InteropServices.ComTypes.INVOKEKIND invKind, IntPtr ppv);
         int CreateInstance(IntPtr pUnkOuter, ref Guid riid, IntPtr ppvObj);
         int GetMops(int memid, IntPtr pBstrMops);
-        void ReleaseTypeAttr(IntPtr pTypeAttr);
-        void ReleaseFuncDesc(IntPtr pFuncDesc);
-        void ReleaseVarDesc(IntPtr pVarDesc);
+        new void ReleaseTypeAttr(IntPtr pTypeAttr);
+        new void ReleaseFuncDesc(IntPtr pFuncDesc);
+        new void ReleaseVarDesc(IntPtr pVarDesc);
         ITypeInfoFunctionCollection Funcs { get; }
         ITypeInfoVariablesCollection Vars { get; }
         ITypeInfoImplementedInterfacesCollection ImplementedInterfaces { get; }
diff --git a/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs b/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs
index b6fb0a168a..6dffee776b 100644
--- a/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs
+++ b/Rubberduck.VBEEditor/VbeRuntime/VbeNativeApiAccessor.cs
@@ -10,14 +10,7 @@ namespace Rubberduck.VBEditor.VbeRuntime
     public class VbeNativeApiAccessor : IVbeNativeApi
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
-
-        private static readonly DllVersion Version;
-        private IVbeNativeApi _runtime;
-        
-        static VbeNativeApiAccessor()
-        {
-            Version = DllVersion.Unknown;
-        }
+        private IVbeNativeApi _runtime;        
         
         private static readonly List<(string Name, Type ApiType, DllVersion Version)> VbeApis =new List<(string Dll, Type ApiType, DllVersion Version)>
         {
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/Application/ExcelApp.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/Application/ExcelApp.cs
index deff1bbbcf..cca1d2b4d2 100644
--- a/Rubberduck.VBEditor.VBA/SafeComWrappers/Application/ExcelApp.cs
+++ b/Rubberduck.VBEditor.VBA/SafeComWrappers/Application/ExcelApp.cs
@@ -6,12 +6,7 @@ namespace Rubberduck.VBEditor.SafeComWrappers.VBA
 {
     public class ExcelApp : HostApplicationBase<Microsoft.Office.Interop.Excel.Application>
     {
-        private IEnumerable<(ComponentType componentType, string moduleName, string procedureName)>
-            _autoMacroIdentifiers;
-
-        public ExcelApp(IVBE vbe) : base(vbe, "Excel", true)
-        {
-        }
+        public ExcelApp(IVBE vbe) : base(vbe, "Excel", true) { }
 
         public override IEnumerable<HostAutoMacro> AutoMacroIdentifiers => new HostAutoMacro[]
         {
diff --git a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs
index 3790e6c8d2..b9c24aafbd 100644
--- a/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs
+++ b/Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBE.cs
@@ -207,7 +207,7 @@ private static bool ComponentHasName(IVBComponent c, string name)
             {"SLDWORKS.EXE", typeof(SolidWorksApp)},
         };
 
-        private static IHostApplication _host;
+        private static IHostApplication _host = null;
 
         /// <summary> Returns the type of Office Application that is hosting the VBE. </summary>
         public IHostApplication HostApplication()
@@ -222,21 +222,21 @@ public IHostApplication HostApplication()
 
             if (HostAppMap.ContainsKey(host))
             {
-                return (IHostApplication)Activator.CreateInstance(HostAppMap[host], this);
+                _host = (IHostApplication)Activator.CreateInstance(HostAppMap[host], this);
+                return _host;
             }
 
             //Guessing the above will work like 99.9999% of the time for supported applications.
             using (var project = ActiveVBProject)
             {
+                IHostApplication result = null;
                 if (project.IsWrappingNullReference)
                 {
                     const int ctlViewHost = 106;
-
                     using (var commandBars = CommandBars)
                     {
                         var hostAppControl = commandBars.FindControl(ControlType.Button, ctlViewHost);
                         {
-                            IHostApplication result;
                             if (hostAppControl.IsWrappingNullReference)
                             {
                                 result = null;
@@ -286,6 +286,11 @@ public IHostApplication HostApplication()
                         }
                     }
                 }
+                if (result != null)
+                {
+                    _host = result;
+                    return result;
+                }
 
                 var references = project.References;
                 {
@@ -294,33 +299,48 @@ public IHostApplication HostApplication()
                         switch (reference.Name)
                         {
                             case "Excel":
-                                return new ExcelApp(this);
+                                result = new ExcelApp(this);
+                                break;
                             case "Access":
-                                return new AccessApp(this);
+                                result = new AccessApp(this);
+                                break;
                             case "Word":
-                                return new WordApp(this);
+                                result = new WordApp(this);
+                                break;
                             case "PowerPoint":
-                                return new PowerPointApp(this);
+                                result = new PowerPointApp(this);
+                                break;
                             case "Outlook":
-                                return new OutlookApp(this);
+                                result = new OutlookApp(this);
+                                break;
                             case "MSProject":
-                                return new ProjectApp(this);
+                                result = new ProjectApp(this);
+                                break;
                             case "Publisher":
-                                return new PublisherApp(this);
+                                result = new PublisherApp(this);
+                                break;
                             case "Visio":
-                                return new VisioApp(this);
+                                result = new VisioApp(this);
+                                break;
                             case "AutoCAD":
-                                return new AutoCADApp(this);
+                                result = new AutoCADApp(this);
+                                break;
                             case "CorelDRAW":
-                                return new CorelDRAWApp(this);
+                                result = new CorelDRAWApp(this);
+                                break;
                             case "SolidWorks":
-                                return new SolidWorksApp(this);
+                                result = new SolidWorksApp(this);
+                                break;
+                            default:
+                                result = null;
+                                break;
                         }
                     }
                 }
-            }
 
-            return null;
+                _host = result;
+                return result;
+            }
         }
 
         /// <summary> Returns the topmost MDI child window. </summary>
diff --git a/Rubberduck.sln b/Rubberduck.sln
index cb2cb931c0..3a01a709a0 100644
--- a/Rubberduck.sln
+++ b/Rubberduck.sln
@@ -10,6 +10,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rubberduck.Parsing", "Rubbe
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{07952BD8-646C-4494-965C-E80F3CDE3485}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		libs\Autodesk.AutoCAD.Interop.Common.dll = libs\Autodesk.AutoCAD.Interop.Common.dll
 		libs\Autodesk.AutoCAD.Interop.dll = libs\Autodesk.AutoCAD.Interop.dll
diff --git a/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs b/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
index afa469d9ab..c43a48b353 100644
--- a/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
+++ b/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
@@ -119,11 +119,11 @@ public MockedCodeExplorer(ProjectType projectType, ComponentType componentType =
                 var item = componentTypes[index];
                 if (item == ComponentType.UserForm)
                 {
-                    project.MockUserFormBuilder($"{item.ToString()}{index}", code is null ? string.Empty : code[index]).AddFormToProjectBuilder();
+                    project.MockUserFormBuilder($"{item}{index}", code is null ? string.Empty : code[index]).AddFormToProjectBuilder();
                 }
                 else
                 {
-                    project.AddComponent($"{item.ToString()}{index}", item, code is null ? string.Empty : code[index]);
+                    project.AddComponent($"{item}{index}", item, code is null ? string.Empty : code[index]);
                 }
             }
 
diff --git a/RubberduckTests/Inspections/UseMeaningfulNameInspectionTests.cs b/RubberduckTests/Inspections/UseMeaningfulNameInspectionTests.cs
index 27f2372e4c..7f00600c07 100644
--- a/RubberduckTests/Inspections/UseMeaningfulNameInspectionTests.cs
+++ b/RubberduckTests/Inspections/UseMeaningfulNameInspectionTests.cs
@@ -159,7 +159,7 @@ internal static Mock<IConfigurationService<CodeInspectionSettings>> GetInspectio
             return settings;
         }
 
-        private IEnumerable<IInspectionResult> InspectionResultsForModules(params (string name, string content, ComponentType componentType)[] modules)
+        private new IEnumerable<IInspectionResult> InspectionResultsForModules(params (string name, string content, ComponentType componentType)[] modules)
         {
             var vbe = MockVbeBuilder.BuildFromModules("TestProject", modules, Enumerable.Empty<ReferenceLibrary>());
             return InspectionResults(vbe.Object);
diff --git a/RubberduckTests/Mocks/MockVbeBuilder.cs b/RubberduckTests/Mocks/MockVbeBuilder.cs
index 0ac5e3a961..ec703b631e 100644
--- a/RubberduckTests/Mocks/MockVbeBuilder.cs
+++ b/RubberduckTests/Mocks/MockVbeBuilder.cs
@@ -34,7 +34,6 @@ public static class ReferenceLibraryExtensions
     /// <summary>
     /// Builds a mock <see cref="IVBE"/>.
     /// </summary>
-    [SuppressMessage("Microsoft.Design", "CA1001")] //CA1001 is complaining about RubberduckTests.Mocks.Windows, which doesn't need to be disposed in this context.
     public class MockVbeBuilder
     {
         public const string TestProjectName = "TestProject1";
diff --git a/RubberduckTests/ParserState/ParserStateTests.cs b/RubberduckTests/ParserState/ParserStateTests.cs
index 74be0829f6..b83fd7bc6a 100644
--- a/RubberduckTests/ParserState/ParserStateTests.cs
+++ b/RubberduckTests/ParserState/ParserStateTests.cs
@@ -14,7 +14,7 @@ namespace RubberduckTests.ParserStateTests
     [TestFixture]
     public class ParserStateTests
     {
-        private static IEnumerable<ParserState> AllowedRunStates = new [] {ParserState.Ready};
+        private static readonly IEnumerable<ParserState> AllowedRunStates = new [] {ParserState.Ready};
 
         [SetUp]
         public void SetUp()
@@ -158,7 +158,6 @@ public void Test_RPS_SuspendParser_Canceled()
         public void Test_RPS_SuspendParser_IncompatibleState()
         {
             var result = SuspensionOutcome.Pending;
-            var wasRun = false;
             var wasSuspended = false;
 
             var vbe = MockVbeBuilder.BuildFromSingleModule("", ComponentType.StandardModule, out var _);
diff --git a/RubberduckTests/Refactoring/ExtractMethod/ExtractMethodModelTests.cs b/RubberduckTests/Refactoring/ExtractMethod/ExtractMethodModelTests.cs
index b8a4f79c8a..76cdf68b20 100644
--- a/RubberduckTests/Refactoring/ExtractMethod/ExtractMethodModelTests.cs
+++ b/RubberduckTests/Refactoring/ExtractMethod/ExtractMethodModelTests.cs
@@ -16,7 +16,7 @@ public class ExtractMethodModelTests
     {
 
         #region variableInternalAndOnlyUsedInternally
-        string internalVariable = @"
+        private readonly string internalVariable = @"
 Option explicit
 Public Sub CodeWithDeclaration()
     Dim x as long
@@ -39,33 +39,24 @@ End Sub
                                                '21:
 
 ";
-        string selectedCode = @"
+        private readonly string selectedCode = @"
 y = x + 1 
 x = 2
 Debug.Print y";
-
-        string outputCode = @"
-Public Sub NewVal( byval x as long, byval y as long)
-    DebugPrint ""something""
-    y = x + 1
-    x = 2
-    DebugPrint y
-End Sub";
         #endregion
 
-        List<IExtractMethodRule> emRules = new List<IExtractMethodRule>(){
-            new ExtractMethodRuleInSelection(),
-            new ExtractMethodRuleIsAssignedInSelection(),
-            new ExtractMethodRuleUsedBefore(),
-            new ExtractMethodRuleUsedAfter(),
-            new ExtractMethodRuleExternalReference()};
+        //private readonly List<IExtractMethodRule> emRules = new List<IExtractMethodRule>(){
+        //    new ExtractMethodRuleInSelection(),
+        //    new ExtractMethodRuleIsAssignedInSelection(),
+        //    new ExtractMethodRuleUsedBefore(),
+        //    new ExtractMethodRuleUsedAfter(),
+        //    new ExtractMethodRuleExternalReference()};
 
         [Test]
         [Category("ExtractMethodModelTests")]
-        public void shouldClassifyDeclarations()
+        public void ShouldClassifyDeclarations()
         {
-            QualifiedModuleName qualifiedModuleName;
-            using (var state = MockParser.ParseString(internalVariable, out qualifiedModuleName))
+            using (var state = MockParser.ParseString(internalVariable, out QualifiedModuleName qualifiedModuleName))
             {
                 var declarations = state.AllDeclarations;
 
@@ -88,9 +79,7 @@ public void shouldClassifyDeclarations()
         [TestFixture]
         public class WhenExtractingFromASelection : ExtractedMethodTests
         {
-
-            #region hard coded data
-            string inputCode = @"
+            private readonly string inputCode = @"
 Option explicit
 Public Sub CodeWithDeclaration()
     Dim x as long
@@ -112,35 +101,25 @@ End Sub
 
 
 ";
-            string selectedCode = @"
+            private readonly string selectedCode = @"
 y = x + 1 
 x = 2
 Debug.Print y";
 
-            string outputCode = @"
-Public Sub NewVal( byval x as long)
-    Dim y as long
-    y = x + 1
-    x = 2
-    DebugPrint y
-End Sub";
-            #endregion
-
             [TestFixture]
             public class WhenTheSelectionIsNotWithinAMethod : WhenExtractingFromASelection
             {
                 [Test]
                 [Category("ExtractMethodModelTests")]
-                public void shouldThrowAnException()
+                public void ShouldThrowAnException()
                 {
-                    QualifiedModuleName qualifiedModuleName;
-                    using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                    using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                     {
                         var declarations = state.AllDeclarations;
 
                         var selection = new Selection(21, 1, 22, 17);
                         QualifiedSelection? qSelection = new QualifiedSelection(qualifiedModuleName, selection);
-                        
+
                         var extractedMethod = new Mock<IExtractedMethod>();
                         var paramClassify = new Mock<IExtractMethodParameterClassification>();
                         var SUT = new ExtractMethodModel(extractedMethod.Object, paramClassify.Object);
@@ -154,10 +133,9 @@ public void shouldThrowAnException()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldProvideAListOfDimsNoLongerNeededInTheContainingMethod()
+            public void ShouldProvideAListOfDimsNoLongerNeededInTheContainingMethod()
             {
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
 
@@ -180,10 +158,9 @@ public void shouldProvideAListOfDimsNoLongerNeededInTheContainingMethod()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldProvideTheSelectionOfLinesOfToRemove()
+            public void ShouldProvideTheSelectionOfLinesOfToRemove()
             {
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
 
@@ -218,10 +195,9 @@ public void shouldProvideTheSelectionOfLinesOfToRemove()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldProvideTheExtractMethodCaller()
+            public void ShouldProvideTheExtractMethodCaller()
             {
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
 
@@ -244,10 +220,9 @@ public void shouldProvideTheExtractMethodCaller()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldProvideThePositionForTheMethodCall()
+            public void ShouldProvideThePositionForTheMethodCall()
             {
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
 
@@ -269,10 +244,9 @@ public void shouldProvideThePositionForTheMethodCall()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldProvideThePositionForTheNewMethod()
+            public void ShouldProvideThePositionForTheNewMethod()
             {
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
 
@@ -304,7 +278,7 @@ public class WhenLocalVariableConstantIsInternal
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldExcludeVariableInSignature()
+            public void ShouldExcludeVariableInSignature()
             {
 
                 #region inputCode
@@ -335,10 +309,10 @@ End Sub
 y = x + 1 
 x = 2
 Debug.Print y";
+
                 #endregion
 
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
 
@@ -370,7 +344,7 @@ public class WhenSplittingSelection
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void shouldSplitTheCodeAroundTheDefinition()
+            public void ShouldSplitTheCodeAroundTheDefinition()
             {
 
                 #region inputCode
@@ -397,12 +371,6 @@ End Sub
 
 ";
 
-                var selectedCode = @"
-    DebugPrint x                      '8
-    y = x + 1
-    Dim z as long                     '10
-    z = x
-    DebugPrint z                      '12";
                 #endregion
 
                 #region whatItShouldLookLike
@@ -417,8 +385,7 @@ end sub
 */
                 #endregion
 
-                QualifiedModuleName qualifiedModuleName;
-                using (var state = MockParser.ParseString(inputCode, out qualifiedModuleName))
+                using (var state = MockParser.ParseString(inputCode, out QualifiedModuleName qualifiedModuleName))
                 {
                     var declarations = state.AllDeclarations;
                     var selection = new Selection(8, 1, 12, 50);
@@ -428,7 +395,7 @@ end sub
                     var yDecl = declarations.Where(decl => decl.IdentifierName.Equals("z"));
                     var SUT = new ExtractMethodModel(extractedMethod.Object, paramClassify.Object);
                     //Act
-                    var actual = SUT.splitSelection(selection, declarations);
+                    var actual = SUT.SplitSelection(selection, declarations);
                     //Assert
                     var selection1 = new Selection(8, 1, 9, 1);
                     var selection2 = new Selection(11, 1, 12, 1);
@@ -448,7 +415,7 @@ public class GroupByConsecutiveTests
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void testSelection()
+            public void TestSelection()
             {
                 IEnumerable<int> list = new List<int> { 2, 3, 4, 6, 8, 9, 10, 12, 13, 15 };
                 var grouped = list.GroupByMissing(x => (x + 1), (x, y) => new Selection(x, 1, y, 1), (x, y) => y - x);
@@ -456,7 +423,7 @@ public void testSelection()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void isUnordered()
+            public void IsUnordered()
             {
                 IEnumerable<int> list = new List<int> { 2, 3, 4, 6, 7, 9, 8, 12, 13, 15 };
 
@@ -466,7 +433,7 @@ public void isUnordered()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void emptyList()
+            public void EmptyList()
             {
                 IEnumerable<int> list = new List<int> { };
                 var grouped = list.GroupByMissing(x => (x + 1), (x, y) => Tuple.Create(x, y), (x, y) => y - x).ToList();
@@ -475,7 +442,7 @@ public void emptyList()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void listOfSingleItem()
+            public void ListOfSingleItem()
             {
                 IEnumerable<int> list = new List<int> { 2 };
                 var grouped = list.GroupByMissing(x => (x + 1), (x, y) => Tuple.Create(x, y), (x, y) => y - x).ToList();
@@ -490,7 +457,7 @@ public void listOfSingleItem()
 
             [Test]
             [Category("ExtractMethodModelTests")]
-            public void testingUsefulList()
+            public void TestingUsefulList()
             {
                 IEnumerable<int> list = new List<int> { 2, 3, 4, 6, 8, 9, 10, 12, 13, 15 };
                 var grouped = list.GroupByMissing(x => (x + 1), (x, y) => Tuple.Create(x, y), (x, y) => y - x).ToList();
diff --git a/RubberduckTests/Rewriter/RewriteSessionTestBase.cs b/RubberduckTests/Rewriter/RewriteSessionTestBase.cs
index 4536979f81..2f9d6f8b7f 100644
--- a/RubberduckTests/Rewriter/RewriteSessionTestBase.cs
+++ b/RubberduckTests/Rewriter/RewriteSessionTestBase.cs
@@ -54,10 +54,8 @@ public void TheInvalidationStatusCannotBeChanged()
         [Category("Rewriter")]
         public void StatusChangesToInvalidStateStaleParseTreeIfADirtyRewriterGetsCheckedOut()
         {
-            var isCalled = false;
             var rewriteSession = RewriteSession(session =>
             {
-                isCalled = true;
                 return true;
             }, out _, rewritersAreDirty: true);
             var module = new QualifiedModuleName("TestProject", string.Empty, "TestModule");