1 files changed, 4 insertions, 9 deletions
diff --git a/src/mnemonics/spanish.h b/src/mnemonics/spanish.h
index ec3a8991d..4b386a968 100644
--- a/src/mnemonics/spanish.h
+++ b/src/mnemonics/spanish.h
@@ -51,9 +51,7 @@ namespace Language
   class Spanish: public Base
   {
   public:
-    Spanish()
-    {
-      word_list = new std::vector<std::string>({
+    Spanish(): Base("Spanish", std::vector<std::string>({
         "ábaco",
         "abdomen",
         "abeja",
@@ -1680,12 +1678,9 @@ namespace Language
         "risa",
         "ritmo",
         "rito"
-      });
-      unique_prefix_length = 4;
-      word_map = new std::unordered_map<std::string, uint32_t>;
-      trimmed_word_map = new std::unordered_map<std::string, uint32_t>;
-      language_name = "Spanish";
-      populate_maps();
+      }), 4)
+    {
+      populate_maps(ALLOW_SHORT_WORDS);
     }
   };
 }