diff --git a/src/main/java/swervelib/SwerveModule.java b/src/main/java/swervelib/SwerveModule.java
index 2e04383d..15312cea 100644
--- a/src/main/java/swervelib/SwerveModule.java
+++ b/src/main/java/swervelib/SwerveModule.java
@@ -38,6 +38,10 @@ public class SwerveModule
    * Drive motor velocity cache.
    */
   public final  Cache<Double>             driveVelocityCache;
+  /**
+   * Module number for kinematics, usually 0 to 3. front left -> front right -> back left -> back right.
+   */
+  public final  int                    moduleNumber;
   /**
    * Swerve Motors.
    */
@@ -78,10 +82,6 @@ public class SwerveModule
    * NT3 Raw drive motor.
    */
   private final String                 rawDriveVelName;
-  /**
-   * Module number for kinematics, usually 0 to 3. front left -> front right -> back left -> back right.
-   */
-  public final  int                    moduleNumber;
   /**
    * Maximum speed of the drive motors in meters per second.
    */
diff --git a/src/main/java/swervelib/math/SwerveMath.java b/src/main/java/swervelib/math/SwerveMath.java
index d78e5871..ca278a9e 100644
--- a/src/main/java/swervelib/math/SwerveMath.java
+++ b/src/main/java/swervelib/math/SwerveMath.java
@@ -359,7 +359,7 @@ public static SwerveModuleConfiguration getSwerveModule(
   /**
    * Put an angle within the 360 deg scope of a reference. For example, given a scope reference of 756 degrees, assumes
    * the full scope is (720-1080), and places an angle of 22 degrees into it, returning 742 deg.
-   * 
+   * <p>
    * A more formal definition: returns the closest angle {@code n} to {@code scopeReference} such that {@code n} is
    * congruent to {@code newAngle}.
    *
diff --git a/src/main/java/swervelib/parser/SwerveDriveConfiguration.java b/src/main/java/swervelib/parser/SwerveDriveConfiguration.java
index d3bcf0c1..347b187d 100644
--- a/src/main/java/swervelib/parser/SwerveDriveConfiguration.java
+++ b/src/main/java/swervelib/parser/SwerveDriveConfiguration.java
@@ -11,6 +11,10 @@
 public class SwerveDriveConfiguration
 {
 
+  /**
+   * Number of modules on the robot.
+   */
+  public final int                                 moduleCount;
   /**
    * Swerve Module locations.
    */
@@ -19,10 +23,6 @@ public class SwerveDriveConfiguration
    * Swerve IMU
    */
   public       SwerveIMU                           imu;
-  /**
-   * Number of modules on the robot.
-   */
-  public final int                                 moduleCount;
   /**
    * Swerve Modules.
    */
diff --git a/src/main/java/swervelib/parser/json/PhysicalPropertiesJson.java b/src/main/java/swervelib/parser/json/PhysicalPropertiesJson.java
index 7715d9d9..60be9d25 100644
--- a/src/main/java/swervelib/parser/json/PhysicalPropertiesJson.java
+++ b/src/main/java/swervelib/parser/json/PhysicalPropertiesJson.java
@@ -2,8 +2,6 @@
 
 import swervelib.parser.SwerveModulePhysicalCharacteristics;
 import swervelib.parser.json.modules.ConversionFactorsJson;
-import swervelib.telemetry.Alert;
-import swervelib.telemetry.Alert.AlertType;
 
 /**
  * {@link swervelib.parser.SwerveModulePhysicalCharacteristics} parsed data. Used to configure the SwerveModule.