diff --git a/include/electronic-id/enums.hpp b/include/electronic-id/enums.hpp
index b639386..1f00618 100644
--- a/include/electronic-id/enums.hpp
+++ b/include/electronic-id/enums.hpp
@@ -33,7 +33,7 @@ namespace electronic_id
 class CertificateType
 {
 public:
-    enum CertificateTypeEnum: int8_t { AUTHENTICATION, SIGNING, NONE = -1 };
+    enum CertificateTypeEnum : int8_t { AUTHENTICATION, SIGNING, NONE = -1 };
 
     CertificateType() = default;
     constexpr CertificateType(const CertificateTypeEnum _value) : value(_value) {}
@@ -53,7 +53,7 @@ class CertificateType
 class HashAlgorithm
 {
 public:
-    enum HashAlgorithmEnum: int16_t {
+    enum HashAlgorithmEnum : int16_t {
         SHA224 = 224, // SHA2
         SHA256 = 256,
         SHA384 = 384,
@@ -172,7 +172,7 @@ class SignatureAlgorithm
 class JsonWebSignatureAlgorithm
 {
 public:
-    enum JsonWebSignatureAlgorithmEnum: int8_t {
+    enum JsonWebSignatureAlgorithmEnum : int8_t {
         ES256, // ECDSA
         ES384,
         ES512,
diff --git a/lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp-utils.hpp b/lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp-utils.hpp
index c64ecba..3cf375e 100644
--- a/lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp-utils.hpp
+++ b/lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp-utils.hpp
@@ -43,10 +43,10 @@ inline std::string int2hexstr(const T value)
 
 /** Remove absolute path prefix until 'src' from the given path, '/path/to/src/main.cpp' becomes
  * 'src/main.cpp'. */
-inline std::string removeAbsolutePathPrefix(std::string filePath)
+constexpr const char* removeAbsolutePathPrefix(std::string_view filePath)
 {
     const auto lastSrc = filePath.rfind("src");
-    return lastSrc == std::string::npos ? std::move(filePath) : filePath.erase(0, lastSrc);
+    return lastSrc == std::string::npos ? filePath.data() : filePath.substr(lastSrc).data();
 }
 
 } // namespace pcsc_cpp
diff --git a/lib/libpcsc-cpp/src/listReaders.cpp b/lib/libpcsc-cpp/src/listReaders.cpp
index 1ad20f8..0676d97 100644
--- a/lib/libpcsc-cpp/src/listReaders.cpp
+++ b/lib/libpcsc-cpp/src/listReaders.cpp
@@ -49,7 +49,7 @@ std::vector<const string_t::value_type*> getReaderNamePointerList(const string_t
     if (readerNames.empty())
         return readerNamePointerList;
 
-        // Reader names are \0 separated and end with double \0.
+    // Reader names are \0 separated and end with double \0.
 #ifdef _WIN32
     for (const string_t::value_type* name = readerNames.c_str(); *name; name += wcslen(name) + 1) {
 #else