diff --git a/src/NmeaParser/Nmea/Bod.cs b/src/NmeaParser/Nmea/Bod.cs
index 4cf054d..551172d 100644
--- a/src/NmeaParser/Nmea/Bod.cs
+++ b/src/NmeaParser/Nmea/Bod.cs
@@ -13,11 +13,7 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
diff --git a/src/NmeaParser/Nmea/Garmin/PGRME.cs b/src/NmeaParser/Nmea/Garmin/PGRME.cs
index 11fcafe..5be2e18 100644
--- a/src/NmeaParser/Nmea/Garmin/PGRME.cs
+++ b/src/NmeaParser/Nmea/Garmin/PGRME.cs
@@ -13,18 +13,13 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea.Garmin
 {
-	/// <summary>
-	///  Recommended Minimum
-	/// </summary>
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Pgrme")]
+    /// <summary>
+    ///  Recommended Minimum
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Pgrme")]
 	[NmeaMessageType("PGRME")]
 	public class Pgrme : NmeaMessage
 	{
diff --git a/src/NmeaParser/Nmea/Garmin/PGRMZ.cs b/src/NmeaParser/Nmea/Garmin/PGRMZ.cs
index 08ec400..82422e5 100644
--- a/src/NmeaParser/Nmea/Garmin/PGRMZ.cs
+++ b/src/NmeaParser/Nmea/Garmin/PGRMZ.cs
@@ -13,11 +13,7 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea.Gps.Garmin
 {
diff --git a/src/NmeaParser/Nmea/Gga.cs b/src/NmeaParser/Nmea/Gga.cs
index dfac8e4..a79fca0 100644
--- a/src/NmeaParser/Nmea/Gga.cs
+++ b/src/NmeaParser/Nmea/Gga.cs
@@ -13,18 +13,14 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
-	/// <summary>
-	///  Global Positioning System Fix Data
-	/// </summary>
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gpgga")]
+    /// <summary>
+    ///  Global Positioning System Fix Data
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gpgga")]
     [NmeaMessageType("--GGA")]
     public class Gga : NmeaMessage
 	{
diff --git a/src/NmeaParser/Nmea/Gll.cs b/src/NmeaParser/Nmea/Gll.cs
index fb33473..f7bcf60 100644
--- a/src/NmeaParser/Nmea/Gll.cs
+++ b/src/NmeaParser/Nmea/Gll.cs
@@ -13,18 +13,13 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
-	/// <summary>
-	///  Geographic position, latitude / longitude
-	/// </summary>
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gll")]
+    /// <summary>
+    ///  Geographic position, latitude / longitude
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gll")]
     [NmeaMessageType("--GLL")]
     public class Gll : NmeaMessage
 	{
diff --git a/src/NmeaParser/Nmea/Gns.cs b/src/NmeaParser/Nmea/Gns.cs
index a3857f9..50234a6 100644
--- a/src/NmeaParser/Nmea/Gns.cs
+++ b/src/NmeaParser/Nmea/Gns.cs
@@ -13,11 +13,8 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
diff --git a/src/NmeaParser/Nmea/Gsa.cs b/src/NmeaParser/Nmea/Gsa.cs
index 42fadea..5407b2d 100644
--- a/src/NmeaParser/Nmea/Gsa.cs
+++ b/src/NmeaParser/Nmea/Gsa.cs
@@ -15,9 +15,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
diff --git a/src/NmeaParser/Nmea/Gst.cs b/src/NmeaParser/Nmea/Gst.cs
index a4b0211..f022c76 100644
--- a/src/NmeaParser/Nmea/Gst.cs
+++ b/src/NmeaParser/Nmea/Gst.cs
@@ -13,11 +13,6 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
diff --git a/src/NmeaParser/Nmea/Gsv.cs b/src/NmeaParser/Nmea/Gsv.cs
index f89751a..0b92e55 100644
--- a/src/NmeaParser/Nmea/Gsv.cs
+++ b/src/NmeaParser/Nmea/Gsv.cs
@@ -12,13 +12,9 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-using NmeaParser.Nmea.Gps;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
diff --git a/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs b/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs
index 1333a63..d5a8de2 100644
--- a/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs
+++ b/src/NmeaParser/Nmea/LaserRange/LaserRangeMessage.cs
@@ -12,20 +12,15 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-using NmeaParser.Nmea;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea.LaserRange
 {
-	/// <summary>
-	/// Laser Range Measurement
-	/// </summary>
-	public abstract class LaserRangeMessage : NmeaMessage
+    /// <summary>
+    /// Laser Range Measurement
+    /// </summary>
+    public abstract class LaserRangeMessage : NmeaMessage
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LaserRangeMessage"/> class.
diff --git a/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs b/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs
index 097c486..e479bfb 100644
--- a/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs
+++ b/src/NmeaParser/Nmea/LaserRange/LaserTech/PLTIT.cs
@@ -12,19 +12,12 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace NmeaParser.Nmea.LaserRange.LaserTech
 {
-	/// <summary>
-	/// Laser Range 
-	/// </summary>
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Pltit")]
+    /// <summary>
+    /// Laser Range 
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Pltit")]
 	[NmeaMessageType("PLTIT")]
 	public class Pltit : LaserRangeMessage
     {
diff --git a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs b/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs
index fc042eb..453d8a8 100644
--- a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs
+++ b/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLA.cs
@@ -12,19 +12,12 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace NmeaParser.Nmea.LaserRange.Trimble
 {
-	/// <summary>
-	/// Burden finder
-	/// </summary>
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ptnla")]
+    /// <summary>
+    /// Burden finder
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ptnla")]
 	[NmeaMessageType("PTNLA")]
 	public class Ptnla : LaserRangeMessage
     {
diff --git a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs b/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs
index 0c47a9e..dce58ae 100644
--- a/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs
+++ b/src/NmeaParser/Nmea/LaserRange/Trimble/PTNLB.cs
@@ -13,11 +13,7 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea.LaserRange.Trimble
 {
diff --git a/src/NmeaParser/Nmea/NmeaMessage.cs b/src/NmeaParser/Nmea/NmeaMessage.cs
index d8fc956..14c4ce4 100644
--- a/src/NmeaParser/Nmea/NmeaMessage.cs
+++ b/src/NmeaParser/Nmea/NmeaMessage.cs
@@ -17,15 +17,13 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
-	/// <summary>
-	/// Nmea message attribute type used on concrete <see cref="NmeaMessage"/> implementations.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    /// <summary>
+    /// Nmea message attribute type used on concrete <see cref="NmeaMessage"/> implementations.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
 	public sealed class NmeaMessageTypeAttribute : Attribute
 	{
 		/// <summary>
diff --git a/src/NmeaParser/Nmea/Rmb.cs b/src/NmeaParser/Nmea/Rmb.cs
index 59d8a78..d4877db 100644
--- a/src/NmeaParser/Nmea/Rmb.cs
+++ b/src/NmeaParser/Nmea/Rmb.cs
@@ -13,13 +13,9 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace NmeaParser.Nmea.Gps
+namespace NmeaParser.Nmea
 {
     /// <summary>
     /// Recommended minimum navigation information
diff --git a/src/NmeaParser/Nmea/Rmc.cs b/src/NmeaParser/Nmea/Rmc.cs
index b66fb89..146b07f 100644
--- a/src/NmeaParser/Nmea/Rmc.cs
+++ b/src/NmeaParser/Nmea/Rmc.cs
@@ -13,18 +13,14 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
-	/// <summary>
-	///  Recommended Minimum
-	/// </summary>
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gprmc")]
+    /// <summary>
+    ///  Recommended Minimum
+    /// </summary>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gprmc")]
     [NmeaMessageType("--RMC")]
     public class Rmc : NmeaMessage
 	{
diff --git a/src/NmeaParser/Nmea/Rte.cs b/src/NmeaParser/Nmea/Rte.cs
index 0dbdfbd..1afe8ee 100644
--- a/src/NmeaParser/Nmea/Rte.cs
+++ b/src/NmeaParser/Nmea/Rte.cs
@@ -16,10 +16,8 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace NmeaParser.Nmea.Gps
+namespace NmeaParser.Nmea
 {
     /// <summary>
     /// Routes
diff --git a/src/NmeaParser/Nmea/UnknownMessage.cs b/src/NmeaParser/Nmea/UnknownMessage.cs
index 2e76bac..cba4f01 100644
--- a/src/NmeaParser/Nmea/UnknownMessage.cs
+++ b/src/NmeaParser/Nmea/UnknownMessage.cs
@@ -12,18 +12,14 @@
 //  *   limitations under the License.
 //  ******************************************************************************
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NmeaParser.Nmea
 {
-	/// <summary>
-	/// Represents an unknown message type
-	/// </summary>
-	public class UnknownMessage : NmeaMessage
+    /// <summary>
+    /// Represents an unknown message type
+    /// </summary>
+    public class UnknownMessage : NmeaMessage
 	{
         internal UnknownMessage(string type, string[] messageParts) : base(type, messageParts) { }
 
diff --git a/src/NmeaParser/Nmea/Vtg.cs b/src/NmeaParser/Nmea/Vtg.cs
index 6d75d58..0c12950 100644
--- a/src/NmeaParser/Nmea/Vtg.cs
+++ b/src/NmeaParser/Nmea/Vtg.cs
@@ -13,10 +13,8 @@
 //  ******************************************************************************
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace NmeaParser.Nmea.Gps
+namespace NmeaParser.Nmea
 {
     /// <summary>
 	///  Course over ground and ground speed