diff --git a/src/BookmarkStore.h b/src/BookmarkStore.h
index f5c245e0..0f41d231 100644
--- a/src/BookmarkStore.h
+++ b/src/BookmarkStore.h
@@ -111,8 +111,7 @@ class BookmarkStore {
 
     bool closeOk = false;
     if (ok) {
-      closeOk = f.close();
-      if (!closeOk) {
+      if (!f.close()) {
         LOG_ERR("BKM", "Failed to close bookmarks file");
         return;
       }
diff --git a/src/GlobalBookmarkIndex.cpp b/src/GlobalBookmarkIndex.cpp
index 27483b2b..1b7e6b1f 100644
--- a/src/GlobalBookmarkIndex.cpp
+++ b/src/GlobalBookmarkIndex.cpp
@@ -4,6 +4,7 @@
 #include <Logging.h>
 
 #include <algorithm>
+#include <numeric>
 
 GlobalBookmarkIndex GlobalBookmarkIndex::instance;
 
@@ -187,7 +188,6 @@ bool GlobalBookmarkIndex::reconcile() {
 }
 
 size_t GlobalBookmarkIndex::totalBookmarkCount() const {
-  size_t total = 0;
-  for (const auto& e : entries) total += e.bookmarks.size();
-  return total;
+  return std::accumulate(entries.begin(), entries.end(), static_cast<size_t>(0),
+                         [](size_t sum, const Entry& e) { return sum + e.bookmarks.size(); });
 }