diff --git a/include/cryptsetupInterface.hpp b/include/cryptsetupInterface.hpp
index 0fb0c32..5942b60 100644
--- a/include/cryptsetupInterface.hpp
+++ b/include/cryptsetupInterface.hpp
@@ -7,6 +7,7 @@
 #include <xyz/openbmc_project/Common/error.hpp>
 
 #include <string>
+#include <string_view>
 
 namespace estoraged
 {
@@ -222,7 +223,7 @@
      *
      *  @param[in] device - path to device file
      */
-    explicit CryptHandle(const char* device) : handle(init(device))
+    explicit CryptHandle(const std::string_view& device) : handle(init(device))
     {}
 
     /** @brief Get a pointer to the crypt_device struct. */
@@ -244,10 +245,10 @@
      *
      *  @param[in] device - path to device file
      */
-    struct crypt_device* init(const char* device)
+    struct crypt_device* init(const std::string_view& device)
     {
         struct crypt_device* cryptDev = nullptr;
-        int retval = crypt_init(&cryptDev, device);
+        int retval = crypt_init(&cryptDev, device.data());
         if (retval < 0)
         {
             lg2::error("Failed to crypt_init", "REDFISH_MESSAGE_ID",
diff --git a/include/estoraged.hpp b/include/estoraged.hpp
index c160fb1..41b589c 100644
--- a/include/estoraged.hpp
+++ b/include/estoraged.hpp
@@ -132,18 +132,15 @@
 
     /** @brief Format LUKS encrypted device.
      *
-     *  @param[in] cd - initialized crypt_device struct for the device.
      *  @param[in] password - password to set for the LUKS device.
      */
-    void formatLuksDev(struct crypt_device* cd, std::vector<uint8_t> password);
+    void formatLuksDev(std::vector<uint8_t> password);
 
     /** @brief Unlock the device.
      *
-     *  @param[in] cd - initialized crypt_device struct for the device.
      *  @param[in] password - password to activate the LUKS device.
      */
-    void activateLuksDev(struct crypt_device* cd,
-                         std::vector<uint8_t> password);
+    void activateLuksDev(std::vector<uint8_t> password);
 
     /** @brief Create the filesystem on the LUKS device.
      *  @details The LUKS device should already be activated, i.e. unlocked.