diff --git a/src/Library/Moves/MoveData.cpp b/src/Library/Moves/MoveData.cpp
index dad7dbc..740ecbb 100644
--- a/src/Library/Moves/MoveData.cpp
+++ b/src/Library/Moves/MoveData.cpp
@@ -1,11 +1,11 @@
 #include "MoveData.hpp"
-#include <unitypes.h>
-PkmnLib::Library::MoveData::MoveData(std::string name, std::string type, PkmnLib::Library::MoveCategory category,
-                                     uint8_t power, uint8_t accuracy, uint8_t baseUsage,
-                                     CreatureLib::Library::AttackTarget target, uint8_t priority,
+#include <utility>
+PkmnLib::Library::MoveData::MoveData(const std::string& name, const std::string& type,
+                                     PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy,
+                                     uint8_t baseUsage, CreatureLib::Library::AttackTarget target, uint8_t priority,
                                      std::unordered_set<std::string> flags)
     : AttackData(name, type, static_cast<CreatureLib::Library::AttackCategory>(category), power, accuracy, baseUsage,
-                 target, priority, flags) {}
+                 target, priority, std::move(flags)) {}
 
 PkmnLib::Library::MoveCategory PkmnLib::Library::MoveData::GetCategory() const {
     return static_cast<PkmnLib::Library::MoveCategory>(AttackData::GetCategory());
diff --git a/src/Library/Moves/MoveData.hpp b/src/Library/Moves/MoveData.hpp
index f1032e0..9852194 100644
--- a/src/Library/Moves/MoveData.hpp
+++ b/src/Library/Moves/MoveData.hpp
@@ -9,7 +9,7 @@ namespace PkmnLib::Library {
     private:
 
     public:
-        MoveData(std::string name, std::string type, PkmnLib::Library::MoveCategory category, uint8_t power,
+        MoveData(const std::string& name, const std::string& type, PkmnLib::Library::MoveCategory category, uint8_t power,
                  uint8_t accuracy, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, uint8_t priority,
                  std::unordered_set<std::string> flags);