diff --git a/src/Generator/Generators/CLI/CLIHeaders.cs b/src/Generator/Generators/CLI/CLIHeaders.cs
index 08a9328b..25d071f5 100644
--- a/src/Generator/Generators/CLI/CLIHeaders.cs
+++ b/src/Generator/Generators/CLI/CLIHeaders.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
 using CppSharp.Generators.CSharp;
-using CppSharp.Types;
 
 namespace CppSharp.Generators.CLI
 {
@@ -13,13 +12,13 @@ namespace CppSharp.Generators.CLI
     /// </summary>
     public class CLIHeaders : CLITemplate
     {
-        public override string FileExtension { get { return "h"; } }
-
         public CLIHeaders(BindingContext context, IEnumerable<TranslationUnit> units)
             : base(context, units)
         {
         }
 
+        public override string FileExtension => "h";
+
         public override void Process()
         {
             PushBlock(BlockKind.Header);
diff --git a/src/Generator/Generators/CLI/CLISources.cs b/src/Generator/Generators/CLI/CLISources.cs
index 9ded7b5b..c1bcc33d 100644
--- a/src/Generator/Generators/CLI/CLISources.cs
+++ b/src/Generator/Generators/CLI/CLISources.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
 using CppSharp.Generators.CSharp;
-using CppSharp.Types;
 using Type = CppSharp.AST.Type;
 
 namespace CppSharp.Generators.CLI
@@ -19,9 +18,10 @@ namespace CppSharp.Generators.CLI
         public CLISources(BindingContext context, IEnumerable<TranslationUnit> units)
             : base(context, units)
         {
-            
         }
 
+        public override string FileExtension { get { return "cpp"; } }
+
         public override void Process()
         {
             PushBlock(BlockKind.Header);
@@ -1228,7 +1228,5 @@ namespace CppSharp.Generators.CLI
                 }).ToList();
             Write(string.Join(", ", names));
         }
-
-        public override string FileExtension { get { return "cpp"; } }
     }
 }
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
index ece834f9..f53c87ff 100644
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -127,10 +127,7 @@ namespace CppSharp.Generators.CSharp
         public CSharpTypePrinter TypePrinter { get; private set; }
         public CSharpExpressionPrinter ExpressionPrinter { get; private set; }
 
-        public override string FileExtension
-        {
-            get { return "cs"; }
-        }
+        public override string FileExtension => "cs";
 
         public CSharpSources(BindingContext context, IEnumerable<TranslationUnit> units,
             CSharpTypePrinter typePrinter, CSharpExpressionPrinter expressionPrinter)