diff --git a/GraalGmapGenerator/Gmap.cs b/GraalGmapGenerator/Gmap.cs
index 4907648..de8216e 100644
--- a/GraalGmapGenerator/Gmap.cs
+++ b/GraalGmapGenerator/Gmap.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-// Test Comment 
-
-namespace GraalGmapGenerator
+namespace GraalGmapGenerator
 {
     public class Gmap
     {
@@ -19,19 +12,12 @@ namespace GraalGmapGenerator
 
         public bool LoadFullMap { get; set; }
 
-        #region Constructors
-
-        public Gmap()
-        {
-        }
-
         public Gmap(
             string name,
             int width,
             int height,
             bool noAutomapping = false,
             bool loadFullMap = false)
-            : this()
         {
             Name = name;
             Width = width;
@@ -39,9 +25,5 @@ namespace GraalGmapGenerator
             NoAutomapping = noAutomapping;
             LoadFullMap = loadFullMap;
         }
-
-        #endregion
-
-       
     }
 }
diff --git a/GraalGmapGenerator/GmapBuilder.cs b/GraalGmapGenerator/GmapBuilder.cs
index c4c8ab6..e65b0cb 100644
--- a/GraalGmapGenerator/GmapBuilder.cs
+++ b/GraalGmapGenerator/GmapBuilder.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace GraalGmapGenerator
+namespace GraalGmapGenerator
 {
     public class GmapBuilder
     {
diff --git a/GraalGmapGenerator/GmapContentGenerator.cs b/GraalGmapGenerator/GmapContentGenerator.cs
index 726203b..983c687 100644
--- a/GraalGmapGenerator/GmapContentGenerator.cs
+++ b/GraalGmapGenerator/GmapContentGenerator.cs
@@ -7,11 +7,7 @@ namespace GraalGmapGenerator
 {
     public class GmapContentGenerator
     {
-        private LevelType _levelType = LevelType.Nw;
-
-        public GmapContentGenerator()
-        {
-        }
+        readonly LevelType _levelType;
 
         public GmapContentGenerator(LevelType levelType)
         {
@@ -38,23 +34,16 @@ namespace GraalGmapGenerator
 
             stringBuilder.AppendLine("LEVELNAMES");
 
-            var levelNames = GetLevelNames(gmap);
-            for (var i = 0; i < levelNames.Count(); i++)
+            var levelNames = GetLevelNames(gmap).ToList();
+            for (var i = 0; i < levelNames.Count; i++)
             {
-                // Start a new line once the current line has 
-                // hit the width of the gmap
+                // Start a new line once the current line has hit the width of the gmap
                 if (i > 0 && i % gmap.Width == 0)
                     stringBuilder.AppendLine();
 
                 var levelName = GetLevelName(i, gmap.Name, _levelType);
                 stringBuilder.Append($"\"{levelName}\"");
 
-                // If at the end of the row
-
-                // lol hmmm no
-                // oh maybe
-                // we'll see 0.0)>[::]
-
                 // Only append a comma if its NOT the end of the row
                 if (i % gmap.Width < (gmap.Width - 1))
                 {
diff --git a/GraalGmapGenerator/Program.cs b/GraalGmapGenerator/Program.cs
index 5d420a6..f7bc0eb 100644
--- a/GraalGmapGenerator/Program.cs
+++ b/GraalGmapGenerator/Program.cs
@@ -17,26 +17,26 @@ namespace GraalGmapGenerator
 
             Console.WriteLine("Gmap width (in levels, for example: 8)...");
             // need to handle errors
-            int width = 0;
+            int width;
             do
             {
-                var isValid = int.TryParse(Console.ReadLine(), out width);
+                var isValid = int.TryParse(Console.ReadLine(), out width) && width > 0;
                 if (!isValid)
                 {
                     Console.WriteLine("Please enter a valid gmap width!");
                 }
-            } while (width == 0);
+            } while (width <= 0);
 
             Console.WriteLine("Gmap height (in levels, for example: 5)...");
-            int height = 0;
+            int height;
             do
             {
-                var isValid = int.TryParse(Console.ReadLine(), out height);
+                var isValid = int.TryParse(Console.ReadLine(), out height) && height > 0;
                 if (!isValid)
                 {
                     Console.WriteLine("Please enter a valid gmap height!");
                 }
-            } while (width == 0);
+            } while (height <= 0);
 
             mapBuilder.SetDimensions(width, height);