diff --git a/libqpdf/JSON.cc b/libqpdf/JSON.cc
index 1f31f71..aef1bb4 100644
--- a/libqpdf/JSON.cc
+++ b/libqpdf/JSON.cc
@@ -494,11 +494,7 @@ JSON::checkSchemaInternal(
         auto pattern_schema = sch_dict->members[pattern_key].m->value.get();
         for (auto const& [key, val]: this_dict->members) {
             checkSchemaInternal(
-                val.m->value.get(),
-                pattern_schema,
-                flags,
-                errors,
-                prefix + "." + key);
+                val.m->value.get(), pattern_schema, flags, errors, prefix + "." + key);
         }
     } else if (sch_dict) {
         for (auto& [key, val]: sch_dict->members) {
diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc
index f008dfe..ccb3cd2 100644
--- a/libqpdf/QPDF_encryption.cc
+++ b/libqpdf/QPDF_encryption.cc
@@ -702,17 +702,17 @@ QPDF::interpretCF(std::shared_ptr<EncryptionParameters> encp, QPDFObjectHandle c
 {
     if (cf.isName()) {
         std::string filter = cf.getName();
-        if (encp->crypt_filters.count(filter) != 0) {
-            return encp->crypt_filters[filter];
-        } else if (filter == "/Identity") {
+        auto it = encp->crypt_filters.find(filter);
+        if (it != encp->crypt_filters.end()) {
+            return it->second;
+        }
+        if (filter == "/Identity") {
             return e_none;
-        } else {
-            return e_unknown;
         }
-    } else {
-        // Default: /Identity
-        return e_none;
+        return e_unknown;
     }
+    // Default: /Identity
+    return e_none;
 }
 
 void