diff --git a/src/Data.cpp b/src/Data.cpp
index fa506166360867647e404c6c0aeffef15b4092f9..52b67d9734f0c08b35ee9ff4d2e4f9cbe75f2f29 100644
--- a/src/Data.cpp
+++ b/src/Data.cpp
@@ -112,8 +112,8 @@ void Data::updateInstalledConfigData()
     fillInstalledConfigs("PCI");
     fillInstalledConfigs("USB");
 
-    setMatchingConfigs(PCIDevices, &installedPCIConfigs, true);
-    setMatchingConfigs(USBDevices, &installedUSBConfigs, true);
+    setMatchingConfigs(PCIDevices, installedPCIConfigs, true);
+    setMatchingConfigs(USBDevices, installedUSBConfigs, true);
 }
 
 void Data::fillInstalledConfigs(std::string type)
@@ -148,7 +148,7 @@ void Data::fillInstalledConfigs(std::string type)
     }
 }
 
-void Data::getAllDevicesOfConfig(Config *config, std::vector<Device*>* foundDevices)
+void Data::getAllDevicesOfConfig(Config *config, std::vector<Device*>& foundDevices)
 {
     std::vector<Device*> devices;
 
@@ -165,9 +165,9 @@ void Data::getAllDevicesOfConfig(Config *config, std::vector<Device*>* foundDevi
 }
 
 void Data::getAllDevicesOfConfig(const std::vector<Device*>& devices, Config *config,
-        std::vector<Device*>* foundDevices)
+        std::vector<Device*>& foundDevices)
 {
-    foundDevices->clear();
+    foundDevices.clear();
 
     for (auto hwdID = config->hwdIDs_.begin();
             hwdID != config->hwdIDs_.end(); ++hwdID)
@@ -297,7 +297,7 @@ void Data::getAllDevicesOfConfig(const std::vector<Device*>& devices, Config *co
                                 else
                                 {
                                     foundDevice = true;
-                                    foundDevices->push_back((*i_device));
+                                    foundDevices.push_back(*i_device);
                                 }
                             }
                         }
@@ -308,7 +308,7 @@ void Data::getAllDevicesOfConfig(const std::vector<Device*>& devices, Config *co
 
         if (!foundDevice)
         {
-            foundDevices->clear();
+            foundDevices.clear();
             return;
         }
     }
@@ -330,24 +330,24 @@ std::vector<Config*> Data::getAllDependenciesToInstall(Config *config)
     }
 
     // Get all depends
-    getAllDependenciesToInstall(config, &installedConfigs, &depends);
+    getAllDependenciesToInstall(config, installedConfigs, &depends);
 
     return depends;
 }
 
 void Data::getAllDependenciesToInstall(Config *config,
-        std::vector<Config*>* installedConfigs, std::vector<Config*> *dependencies)
+        std::vector<Config*>& installedConfigs, std::vector<Config*> *dependencies)
 {
     for (auto configDependency = config->dependencies_.begin();
             configDependency != config->dependencies_.end(); configDependency++)
     {
-        auto found = std::find_if(installedConfigs->begin(), installedConfigs->end(),
+        auto found = std::find_if(installedConfigs.begin(), installedConfigs.end(),
                 [configDependency](const Config* rhs)->bool
                 {
                     return (*configDependency == rhs->name_);
                 });
 
-        if (found != installedConfigs->end())
+        if (found != installedConfigs.end())
         {
             continue;
         }
@@ -732,17 +732,17 @@ void Data::updateConfigData()
     fillAllConfigs("PCI");
     fillAllConfigs("USB");
 
-    setMatchingConfigs(PCIDevices, &allPCIConfigs, false);
-    setMatchingConfigs(USBDevices, &allUSBConfigs, false);
+    setMatchingConfigs(PCIDevices, allPCIConfigs, false);
+    setMatchingConfigs(USBDevices, allUSBConfigs, false);
 
     // Update also installed config data
     updateInstalledConfigData();
 }
 
-void Data::setMatchingConfigs(const std::vector<Device*>& devices, std::vector<Config*>* configs,
+void Data::setMatchingConfigs(const std::vector<Device*>& devices, std::vector<Config*>& configs,
         bool setAsInstalled)
 {
-    for (auto config = configs->begin(); config != configs->end();
+    for (auto config = configs.begin(); config != configs.end();
             ++config)
     {
         setMatchingConfig((*config), devices, setAsInstalled);
@@ -753,7 +753,7 @@ void Data::setMatchingConfig(Config* config, const std::vector<Device*>& devices
 {
     std::vector<Device*> foundDevices;
 
-    getAllDevicesOfConfig(devices, config, &foundDevices);
+    getAllDevicesOfConfig(devices, config, foundDevices);
 
     // Set config to all matching devices
     for (auto foundDevice = foundDevices.begin();
@@ -761,19 +761,19 @@ void Data::setMatchingConfig(Config* config, const std::vector<Device*>& devices
     {
         if (setAsInstalled)
         {
-            addConfigSorted(&(*foundDevice)->installedConfigs_, config);
+            addConfigSorted((*foundDevice)->installedConfigs_, config);
         }
         else
         {
-            addConfigSorted(&(*foundDevice)->availableConfigs_, config);
+            addConfigSorted((*foundDevice)->availableConfigs_, config);
         }
     }
 }
 
-void Data::addConfigSorted(std::vector<Config*>* configs, Config* config)
+void Data::addConfigSorted(std::vector<Config*>& configs, Config* config)
 {
-    for (auto iterator = configs->begin();
-            iterator != configs->end(); iterator++)
+    for (auto iterator = configs.begin();
+            iterator != configs.end(); iterator++)
     {
         if (config->name_ == (*iterator)->name_)
         {
@@ -781,20 +781,20 @@ void Data::addConfigSorted(std::vector<Config*>* configs, Config* config)
         }
     }
 
-    for (auto iterator = configs->begin(); iterator != configs->end();
+    for (auto iterator = configs.begin(); iterator != configs.end();
             iterator++)
     {
         if (config->priority_ > (*iterator)->priority_)
         {
-            configs->insert(iterator, config);
+            configs.insert(iterator, config);
             return;
         }
     }
 
-    configs->push_back(config);
+    configs.push_back(config);
 }
 
-Vita::string Data::from_Hex(uint16_t hexnum, int fill)
+Vita::string Data::from_Hex(std::uint16_t hexnum, int fill)
 {
     std::stringstream stream;
     stream << std::hex << std::setfill('0') << std::setw(fill) << hexnum;
diff --git a/src/Data.hpp b/src/Data.hpp
index d50e5237118a4f55b8425cbf32497e2da1978a51..86ff4e044661596ebdcbefc55e60c2929bbb6039 100644
--- a/src/Data.hpp
+++ b/src/Data.hpp
@@ -42,11 +42,11 @@ public:
     std::vector<Config*> invalidConfigs;
 
     void updateInstalledConfigData();
-    void getAllDevicesOfConfig(Config *config, std::vector<Device*>* foundDevices);
+    void getAllDevicesOfConfig(Config *config, std::vector<Device*>& foundDevices);
     bool fillConfig(Config *config, std::string configPath, std::string type);
 
     std::vector<Config*> getAllDependenciesToInstall(Config *config);
-    void getAllDependenciesToInstall(Config *config, std::vector<Config*>* installedConfigs,
+    void getAllDependenciesToInstall(Config *config, std::vector<Config*>& installedConfigs,
             std::vector<Config*> *depends);
     Config* getDatabaseConfig(const std::string configName, const std::string configType);
     std::vector<Config*> getAllLocalConflicts(Config *config);
@@ -54,14 +54,14 @@ public:
 
 private:
     void getAllDevicesOfConfig(const std::vector<Device*>& devices, Config *config,
-            std::vector<Device*>* foundDevices);
+            std::vector<Device*>& foundDevices);
     void fillInstalledConfigs(std::string type);
     void fillDevices(std::string type);
     void fillAllConfigs(std::string type);
-    void setMatchingConfigs(const std::vector<Device*>& devices, std::vector<Config*>* configs,
+    void setMatchingConfigs(const std::vector<Device*>& devices, std::vector<Config*>& configs,
             bool setAsInstalled);
     void setMatchingConfig(Config* config, const std::vector<Device*>& devices, bool setAsInstalled);
-    void addConfigSorted(std::vector<Config*>* configs, Config* config);
+    void addConfigSorted(std::vector<Config*>& configs, Config* config);
     std::vector<std::string> getRecursiveDirectoryFileList(const std::string directoryPath,
             std::string onlyFilename = "");
 
diff --git a/src/Mhwd.cpp b/src/Mhwd.cpp
index cd8f1b0974ab3ed05931d39dfa00b6fca8c84a9a..4f9df9ea45ec46625c0fd1cbdc207b6d0e1b9db1 100644
--- a/src/Mhwd.cpp
+++ b/src/Mhwd.cpp
@@ -649,7 +649,7 @@ bool Mhwd::runScript(Config *config, MHWD::TRANSACTIONTYPE operationType)
     // Set all config devices as argument
     std::vector<Device*> foundDevices;
     std::vector<Device*> devices;
-    data_.getAllDevicesOfConfig(config, &foundDevices);
+    data_.getAllDevicesOfConfig(config, foundDevices);
 
     for (auto iterator = foundDevices.begin();
             iterator != foundDevices.end(); iterator++)