diff --git a/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java b/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java
index 93111f6b..19fbc29d 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java
@@ -1,16 +1,16 @@
 package hirs.utils;
 
-//import lombok.AccessLevel;
-//import lombok.NoArgsConstructor;
-
 import java.math.BigInteger;
 
 /**
  * Utilities for working with hex strings and byte arrays.
  */
-//@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class HexUtils {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private HexUtils() { }
     /**
      * The mathematical base for the hexadecimal representation.
      */
diff --git a/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java b/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
index 770808ea..3626872e 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
@@ -2,8 +2,6 @@ package hirs.utils;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;
-//import lombok.AccessLevel;
-//import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 import java.io.FileInputStream;
@@ -20,9 +18,13 @@ import java.nio.file.Path;
  * library.
  */
 @Log4j2
-//@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class JsonUtils {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private JsonUtils() { }
+
     /**
      * Getter for the JSON Object that is associated with the elementName value
      * mapped in the associated JSON file.
diff --git a/HIRS_Utils/src/main/java/hirs/utils/PciIds.java b/HIRS_Utils/src/main/java/hirs/utils/PciIds.java
index ceeabbd0..57751f5e 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/PciIds.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/PciIds.java
@@ -25,6 +25,11 @@ import java.util.List;
 @Log4j2
 public final class PciIds {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private PciIds() { }
+
     /**
      * This pci ids file can be in different places on different distributions.
      */
diff --git a/HIRS_Utils/src/main/java/hirs/utils/enums/DeviceInfoEnums.java b/HIRS_Utils/src/main/java/hirs/utils/enums/DeviceInfoEnums.java
index 1a9e5447..fef2c9a3 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/enums/DeviceInfoEnums.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/enums/DeviceInfoEnums.java
@@ -1,6 +1,12 @@
 package hirs.utils.enums;
 
 public final class DeviceInfoEnums {
+
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private DeviceInfoEnums() { }
+
     /**
      * A variable used to describe unavailable hardware, firmware, or OS info.
      */
diff --git a/HIRS_Utils/src/main/java/hirs/utils/swid/SwidTagConstants.java b/HIRS_Utils/src/main/java/hirs/utils/swid/SwidTagConstants.java
index a74e2e49..89ea5581 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/swid/SwidTagConstants.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/swid/SwidTagConstants.java
@@ -3,7 +3,6 @@ package hirs.utils.swid;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 
-
 /**
  * This class contains the String constants that are referenced by the gateway
  * class. It is expected that member properties of this class will expand as
@@ -11,6 +10,11 @@ import javax.xml.namespace.QName;
  */
 public class SwidTagConstants {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private SwidTagConstants() { }
+
     public static final String DEFAULT_KEYSTORE_FILE = "keystore.jks";//"/opt/hirs/rimtool/keystore.jks";
     public static final String DEFAULT_KEYSTORE_PASSWORD = "password";
     public static final String DEFAULT_PRIVATE_KEY_ALIAS = "1";
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvConstants.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvConstants.java
index 8f53f7cc..f71574db 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvConstants.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/EvConstants.java
@@ -1,15 +1,16 @@
 package hirs.utils.tpm.eventlog.events;
 
-//import lombok.AccessLevel;
-//import lombok.NoArgsConstructor;
-
 /**
  * Class for defining constants referenced in the PC Client
  * Platform Firmware Profile specification.
  */
-//@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class EvConstants {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private EvConstants() { }
+
     /**
      * Type length = 4 bytes.
      */
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/package-info.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/package-info.java
index c1cc588d..a6869958 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/package-info.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Non-persistant classes related to TGC Event Logs.
+ * Non-persistent classes related to TGC Event Logs.
  */
 
 package hirs.utils.tpm.eventlog.events;
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/package-info.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/package-info.java
index b889eb14..025b8e4c 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/package-info.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Non-persistant classes related to TGC Event Logs.
+ * Non-persistent classes related to TGC Event Logs.
  */
 
 package hirs.utils.tpm.eventlog;
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/SpdmHa.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/SpdmHa.java
index 3ad7ce20..b64d013b 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/SpdmHa.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/SpdmHa.java
@@ -6,6 +6,11 @@ package hirs.utils.tpm.eventlog.spdm;
  */
 public class SpdmHa {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private SpdmHa() { }
+
     /**
      * Spdm Hash Alg = Raw bit stream.
      */
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/package-info.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/package-info.java
new file mode 100644
index 00000000..64b778b4
--- /dev/null
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/spdm/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Non-persistent classes related to TGC Event Logs.
+ */
+
+package hirs.utils.tpm.eventlog.spdm;
\ No newline at end of file
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiConstants.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiConstants.java
index 8d54ba09..655ffa68 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiConstants.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/UefiConstants.java
@@ -1,16 +1,17 @@
 package hirs.utils.tpm.eventlog.uefi;
 
-//import lombok.AccessLevel;
-//import lombok.NoArgsConstructor;
-
 /**
  * This class contains the String constants that are referenced by UEFI.
  * It is expected that member properties of this class will expand as
  * more functionality is added.
  */
-//@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class UefiConstants {
 
+    /**
+     * Default private constructor so checkstyles doesn't complain
+     */
+    private UefiConstants() { }
+
     /**
      * 2 byte size.
      */
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/package-info.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/package-info.java
index 49a26bc9..c5971e6f 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/package-info.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/uefi/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Non-persistant classes related to TGC Event Logs.
+ * Non-persistent classes related to TGC Event Logs.
  */
 
 package hirs.utils.tpm.eventlog.uefi;
diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/package-info.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/package-info.java
index ea3ec288..2b164e32 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/package-info.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Non-persistant classes related to TPM.
+ * Non-persistent classes related to TPM.
  */
 
 package hirs.utils.tpm;