diff --git a/Cafe.Matcha.Packer/Program.cs b/Cafe.Matcha.Packer/Program.cs
index 78b4987..1356cd9 100644
--- a/Cafe.Matcha.Packer/Program.cs
+++ b/Cafe.Matcha.Packer/Program.cs
@@ -1,7 +1,5 @@
-// <copyright file="Program.cs" company="FFCafe">
-// Copyright (c) FFCafe. All rights reserved.
+// Copyright (c) FFCafe. All rights reserved.
 // Licensed under the AGPL-3.0 license. See LICENSE file in the project root for full license information.
-// </copyright>
 
 namespace Cafe.Matcha.Packer
 {
@@ -30,7 +28,8 @@ private static void GenerateAssembly()
 
 namespace Cafe.Matcha
 {
-    partial class Data {
+    public partial class Data
+    {
         public const string Version = ""{0}"";
     }
 }
@@ -85,6 +84,5 @@ private static void Main(string[] args)
                 Bundle(env);
             }
         }
-
     }
 }
diff --git a/Cafe.Matcha.Packer/Properties/AssemblyInfo.cs b/Cafe.Matcha.Packer/Properties/AssemblyInfo.cs
index 02ee992..81ea94a 100644
--- a/Cafe.Matcha.Packer/Properties/AssemblyInfo.cs
+++ b/Cafe.Matcha.Packer/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
-// <copyright file="AssemblyInfo.cs" company="FFCafe">
-// Copyright (c) FFCafe. All rights reserved.
+// Copyright (c) FFCafe. All rights reserved.
 // Licensed under the AGPL-3.0 license. See LICENSE file in the project root for full license information.
-// </copyright>
 
 using System.Reflection;
 using System.Runtime.InteropServices;
diff --git a/Cafe.Matcha/Network/State.cs b/Cafe.Matcha/Network/State.cs
index 91da183..0b1d4ef 100644
--- a/Cafe.Matcha/Network/State.cs
+++ b/Cafe.Matcha/Network/State.cs
@@ -97,14 +97,14 @@ private void Fate_OnChanged(uint id, FateState state)
         private void Fate_OnRemoved(uint id, FateState state)
         {
             // Emit only on progress=100 or expired
-            if (state.Progress == 100 || isFateNearEnd(state))
+            if (state.Progress == 100 || IsFateNearEnd(state))
             {
                 state.Progress = -1;
                 fateTelemetry.Send(id, state);
             }
         }
 
-        private bool isFateNearEnd(FateState state)
+        private bool IsFateNearEnd(FateState state)
         {
             if (state.StartTime == 0 || state.Duration == 0)
             {
diff --git a/Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs b/Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs
index f30a4a8..0a4ab1f 100644
--- a/Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs
+++ b/Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs
@@ -76,7 +76,9 @@ public static MarketBoardCurrentOfferings Read(byte[] data)
                             };
 
                             if (materiaEntry.MateriaId != 0)
+                            {
                                 materiaList.Add(materiaEntry);
+                            }
                         }
 
                         listingEntry.Materia = materiaList;
@@ -97,7 +99,9 @@ public static MarketBoardCurrentOfferings Read(byte[] data)
                         reader.ReadBytes(0x4); // Padding
 
                         if (listingEntry.CatalogId != 0)
+                        {
                             listings.Add(listingEntry);
+                        }
                     }
 
                     output.InternalItemListings = listings;
diff --git a/Cafe.Matcha/Telemetry/Npc.cs b/Cafe.Matcha/Telemetry/Npc.cs
index 5f75391..afb01e4 100644
--- a/Cafe.Matcha/Telemetry/Npc.cs
+++ b/Cafe.Matcha/Telemetry/Npc.cs
@@ -7,7 +7,7 @@ namespace Cafe.Matcha.Telemetry
     using Cafe.Matcha.Utils;
     using Newtonsoft.Json;
 
-    class NpcDTO : Models.TelemetryData
+    internal class NpcDTO : Models.TelemetryData
     {
         public NpcDTO(uint id, Network.NpcState state) : base()
         {
@@ -145,7 +145,7 @@ public override bool TryMerge(TelemetryData data)
         }
     }
 
-    class Npc : TelemetryWorker<NpcDTO>
+    internal class Npc : TelemetryWorker<NpcDTO>
     {
         public Npc() : base(Constant.Secret.TelemetryNpc) { }
 
diff --git a/Cafe.Matcha/ViewModels/MainViewModel.cs b/Cafe.Matcha/ViewModels/MainViewModel.cs
index 4148eb6..8bf634b 100644
--- a/Cafe.Matcha/ViewModels/MainViewModel.cs
+++ b/Cafe.Matcha/ViewModels/MainViewModel.cs
@@ -320,6 +320,7 @@ public string World
                 }
             }
         }
+
         public ListBindingTarget<Models.Template> Templates { get; set; } = Data.Instance.Templates != null ? new ListBindingTarget<Models.Template>(Data.Instance.Templates) : null;
         public Models.Template SelectedTemplate { get; set; } = null;
         public ListBindingTarget<FateTreeNodeWithChildren> Fates { get; set; } = FateTreeNodeWithChildren.Create(null);
diff --git a/Cafe.Matcha/Views/MainControl.xaml.cs b/Cafe.Matcha/Views/MainControl.xaml.cs
index 5b3d721..49ad8cb 100644
--- a/Cafe.Matcha/Views/MainControl.xaml.cs
+++ b/Cafe.Matcha/Views/MainControl.xaml.cs
@@ -250,6 +250,7 @@ private bool ShouldSendNotice(BaseDTO dto)
                             notifiedDynamicEvent.Remove(deDto.Event);
                             return false;
                     }
+
                 default:
                     return false;
             }
@@ -353,7 +354,6 @@ private void BSettingInstTest_Click(object sender, RoutedEventArgs e)
             }
         }
 
-
         private void BSettingSetTemplate_Click(object sender, RoutedEventArgs e)
         {
             var template = ViewModel.SelectedTemplate;