diff --git a/lib/Epub/Epub/ParsedText.cpp b/lib/Epub/Epub/ParsedText.cpp
index 07e4ed8..b3a37d6 100644
--- a/lib/Epub/Epub/ParsedText.cpp
+++ b/lib/Epub/Epub/ParsedText.cpp
@@ -1,7 +1,6 @@
 #include "ParsedText.h"
 
 #include <GfxRenderer.h>
-#include "hyphenation/Hyphenator.h"
 
 #include <algorithm>
 #include <cmath>
@@ -10,6 +9,8 @@
 #include <limits>
 #include <vector>
 
+#include "hyphenation/Hyphenator.h"
+
 constexpr int MAX_COST = std::numeric_limits<int>::max();
 
 namespace {
diff --git a/lib/Epub/Epub/hyphenation/EnglishHyphenator.cpp b/lib/Epub/Epub/hyphenation/EnglishHyphenator.cpp
index cef341d..ca179d8 100644
--- a/lib/Epub/Epub/hyphenation/EnglishHyphenator.cpp
+++ b/lib/Epub/Epub/hyphenation/EnglishHyphenator.cpp
@@ -93,18 +93,15 @@ bool englishSegmentHasVowel(const std::vector<CodepointInfo>& cps, const size_t
 
 void appendMorphologyBreaks(const std::vector<CodepointInfo>& cps, const std::string& lowerWord,
                             std::vector<size_t>& indexes) {
-  static constexpr std::array<LatinLiteral, 20> PREFIXES = {{{"anti", 4},   {"auto", 4},   {"counter", 7}, {"de", 2},
-                                                             {"dis", 3},    {"hyper", 5},  {"inter", 5},   {"micro", 5},
-                                                             {"mis", 3},    {"mono", 4},   {"multi", 5},   {"non", 3},
-                                                             {"over", 4},   {"post", 4},   {"pre", 3},     {"pro", 3},
-                                                             {"re", 2},     {"sub", 3},    {"super", 5},   {"trans", 5}}};
+  static constexpr std::array<LatinLiteral, 20> PREFIXES = {
+      {{"anti", 4},  {"auto", 4}, {"counter", 7}, {"de", 2},    {"dis", 3},   {"hyper", 5}, {"inter", 5},
+       {"micro", 5}, {"mis", 3},  {"mono", 4},    {"multi", 5}, {"non", 3},   {"over", 4},  {"post", 4},
+       {"pre", 3},   {"pro", 3},  {"re", 2},      {"sub", 3},   {"super", 5}, {"trans", 5}}};
 
-  static constexpr std::array<LatinLiteral, 24> SUFFIXES = {{{"able", 4},   {"ible", 4},   {"ing", 3},    {"ings", 4},
-                                                             {"ed", 2},     {"er", 2},     {"ers", 3},    {"est", 3},
-                                                             {"ful", 3},    {"hood", 4},   {"less", 4},   {"lessly", 6},
-                                                             {"ly", 2},     {"ment", 4},   {"ments", 5},  {"ness", 4},
-                                                             {"ous", 3},    {"tion", 4},   {"sion", 4},   {"ward", 4},
-                                                             {"wards", 5},  {"ship", 4},   {"ships", 5},  {"y", 1}}};
+  static constexpr std::array<LatinLiteral, 24> SUFFIXES = {
+      {{"able", 4}, {"ible", 4}, {"ing", 3},  {"ings", 4},   {"ed", 2},    {"er", 2},   {"ers", 3},   {"est", 3},
+       {"ful", 3},  {"hood", 4}, {"less", 4}, {"lessly", 6}, {"ly", 2},    {"ment", 4}, {"ments", 5}, {"ness", 4},
+       {"ous", 3},  {"tion", 4}, {"sion", 4}, {"ward", 4},   {"wards", 5}, {"ship", 4}, {"ships", 5}, {"y", 1}}};
 
   const size_t length = cps.size();
   if (length < MIN_PREFIX_CP + MIN_SUFFIX_CP) {
diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp
index c5a5634..0b31755 100644
--- a/src/activities/settings/SettingsActivity.cpp
+++ b/src/activities/settings/SettingsActivity.cpp
@@ -16,8 +16,7 @@ const SettingInfo settingsList[settingsCount] = {
     {"Extra Paragraph Spacing", SettingType::TOGGLE, &CrossPointSettings::extraParagraphSpacing, {}},
     {"Short Power Button Click", SettingType::TOGGLE, &CrossPointSettings::shortPwrBtn, {}},
     {"Check for updates", SettingType::ACTION, nullptr, {}},
-    {"Hyphenation", SettingType::TOGGLE, &CrossPointSettings::hyphenationEnabled, {}}
-};
+    {"Hyphenation", SettingType::TOGGLE, &CrossPointSettings::hyphenationEnabled, {}}};
 }  // namespace
 
 void SettingsActivity::taskTrampoline(void* param) {