diff --git a/src/hei_chip.hpp b/src/hei_chip.hpp
index 3b17164..20b0b8c 100644
--- a/src/hei_chip.hpp
+++ b/src/hei_chip.hpp
@@ -12,14 +12,6 @@
 class Chip
 {
   public: // Constructors, destructors, assignment, etc.
-    Chip() = default;
-
-    ~Chip() = default;
-
-    Chip(const Chip&) = default;
-
-    Chip& operator=(const Chip&) = default;
-
     /**
      * @brief Constructor.
      * @param i_chip See description for iv_chip.
@@ -29,6 +21,12 @@
         iv_chip(i_chip), iv_type(i_type)
     {}
 
+    ~Chip() = default;
+
+    Chip(const Chip&) = default;
+
+    Chip& operator=(const Chip&) = default;
+
   public: // Accessors
     const void* getChip() const
     {
@@ -60,14 +58,14 @@
      * purpose is to eventually get passed back to the user application with
      * information associated with each chip.
      */
-    const void* iv_chip = nullptr;
+    const void* iv_chip;
 
     /**
      * When doing analysis on a chip, the isolator will need to know the chip
      * type in order to look up the correct information from the Chip Data
      * Files.
      */
-    ChipType_t iv_type = CHIP_TYPE_INVALID;
+    ChipType_t iv_type;
 
 }; // end class Chip
 
diff --git a/src/hei_types.hpp b/src/hei_types.hpp
index df3f2ff..7cb853a 100644
--- a/src/hei_types.hpp
+++ b/src/hei_types.hpp
@@ -23,16 +23,11 @@
  *   The values are determined by the chip manufacturer. The isolator does not
  *   need to know the possible values because the user application controls
  *   both the Chip Data Files and the input into the isolation function.
- *   Therefore, no values will be listed in this enum except for the default
- *   invalid type.
  *
  * Range:
  *   A 4-byte field should be sufficient.
  */
-enum ChipType_t : uint32_t
-{
-    CHIP_TYPE_INVALID = 0, ///< invalid/unsupported type
-};
+using ChipType_t = uint32_t;
 
 /**
  * Different chips will contain different types of registers. Also, a single