diff --git a/apps/opencs/model/tools/referencecheck.cpp b/apps/opencs/model/tools/referencecheck.cpp
index dd93b4e9cc..76bfeb3ba2 100644
--- a/apps/opencs/model/tools/referencecheck.cpp
+++ b/apps/opencs/model/tools/referencecheck.cpp
@@ -28,76 +28,59 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &message
     const CSMWorld::CellRef& cellRef = record.get();
     const CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Reference, cellRef.mId);
 
-    // Check for empty reference id
-    if (cellRef.mRefID.empty()) {
-        messages.push_back(std::make_pair(id, "Instance is not based on an object"));
-    } else {
+    // Check reference id
+    if (cellRef.mRefID.empty())
+        messages.add(id, "Instance is not based on an object", "", CSMDoc::Message::Severity_Error);
+    else 
+    {
         // Check for non existing referenced object
-        if (mObjects.searchId(cellRef.mRefID) == -1) {
-            messages.push_back(std::make_pair(id, "Instance of a non-existent object '" + cellRef.mRefID + "'"));
-        } else {
+        if (mObjects.searchId(cellRef.mRefID) == -1)
+            messages.add(id, "Instance of a non-existent object '" + cellRef.mRefID + "'", "", CSMDoc::Message::Severity_Error);
+        else 
+        {
             // Check if reference charge is valid for it's proper referenced type
             CSMWorld::RefIdData::LocalIndex localIndex = mDataSet.searchId(cellRef.mRefID);
             bool isLight = localIndex.second == CSMWorld::UniversalId::Type_Light;
-            if ((isLight && cellRef.mChargeFloat < -1) || (!isLight && cellRef.mChargeInt < -1)) {
-                std::string str = "Invalid charge: ";
-                if (localIndex.second == CSMWorld::UniversalId::Type_Light)
-                    str += std::to_string(cellRef.mChargeFloat);
-                else
-                    str += std::to_string(cellRef.mChargeInt);
-                messages.push_back(std::make_pair(id, str));
-            }
+            if ((isLight && cellRef.mChargeFloat < -1) || (!isLight && cellRef.mChargeInt < -1))
+                messages.add(id, "Invalid charge", "", CSMDoc::Message::Severity_Error);
         }
     }
 
     // If object have owner, check if that owner reference is valid
     if (!cellRef.mOwner.empty() && mObjects.searchId(cellRef.mOwner) == -1)
-        messages.push_back(std::make_pair(id, "Owner object '" + cellRef.mOwner + "' does not exist"));
+        messages.add(id, "Owner object '" + cellRef.mOwner + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
     // If object have creature soul trapped, check if that creature reference is valid
     if (!cellRef.mSoul.empty())
         if (mObjects.searchId(cellRef.mSoul) == -1)
-            messages.push_back(std::make_pair(id, "Trapped soul object '" + cellRef.mSoul + "' does not exist"));
+            messages.add(id, "Trapped soul object '" + cellRef.mOwner + "' does not exist", "", CSMDoc::Message::Severity_Error);
 
-    bool hasFaction = !cellRef.mFaction.empty();
-
-    // If object have faction, check if that faction reference is valid
-    if (hasFaction)
-        if (mFactions.searchId(cellRef.mFaction) == -1)
-            messages.push_back(std::make_pair(id, "Faction '" + cellRef.mFaction + "' does not exist"));
-
-    // Check item's faction rank
-    if ((hasFaction && cellRef.mFactionRank < -1) || (!hasFaction && cellRef.mFactionRank != -2))
-        messages.push_back(std::make_pair(id, "Invalid faction rank " + std::to_string(cellRef.mFactionRank)));
-
-    // If door have destination cell, check if that reference is valid
-    if (!cellRef.mDestCell.empty())
-        if (mCells.searchId(cellRef.mDestCell) == -1)
-            messages.push_back(std::make_pair(id, "Destination cell '" + cellRef.mDestCell + "' does not exist"));
-
-    // Check if scale isn't negative
-    if (cellRef.mScale < 0)
+    if (cellRef.mFaction.empty())
     {
-        std::string str = "Negative scale: ";
-        str += std::to_string(cellRef.mScale);
-        messages.push_back(std::make_pair(id, str));
+        if (cellRef.mFactionRank != -2)
+            messages.add(id, "Reference without a faction has a faction rank", "", CSMDoc::Message::Severity_Error);
     }
+    else
+    {
+        if (mFactions.searchId(cellRef.mFaction) == -1)
+            messages.add(id, "Faction '" + cellRef.mFaction + "' does not exist", "", CSMDoc::Message::Severity_Error);
+        else if (cellRef.mFactionRank < -1)
+            messages.add(id, "Invalid faction rank", "", CSMDoc::Message::Severity_Error);
+    }
+
+    if (!cellRef.mDestCell.empty() && mCells.searchId(cellRef.mDestCell) == -1)
+        messages.add(id, "Destination cell '" + cellRef.mDestCell + "' does not exist", "", CSMDoc::Message::Severity_Error);
+
+    if (cellRef.mScale < 0)
+        messages.add(id, "Negative scale", "", CSMDoc::Message::Severity_Error);
 
     // Check if enchantement points aren't negative or are at full (-1)
-    if (cellRef.mEnchantmentCharge < 0 && cellRef.mEnchantmentCharge != -1)
-    {
-        std::string str = "Negative enchantment points: ";
-        str += std::to_string(cellRef.mEnchantmentCharge);
-        messages.push_back(std::make_pair(id, str));
-    }
+    if (cellRef.mEnchantmentCharge < -1)
+        messages.add(id, "Negative number of enchantment points", "", CSMDoc::Message::Severity_Error);
 
     // Check if gold value isn't negative
     if (cellRef.mGoldValue < 0)
-    {
-        std::string str = "Negative gold value: ";
-        str += cellRef.mGoldValue;
-        messages.push_back(std::make_pair(id, str));
-    }
+        messages.add(id, "Negative gold value", "", CSMDoc::Message::Severity_Error);
 }
 
 int CSMTools::ReferenceCheckStage::setup()
diff --git a/apps/opencs/model/tools/skillcheck.cpp b/apps/opencs/model/tools/skillcheck.cpp
index ab7df51cb5..89eba011a8 100644
--- a/apps/opencs/model/tools/skillcheck.cpp
+++ b/apps/opencs/model/tools/skillcheck.cpp
@@ -35,10 +35,8 @@ void CSMTools::SkillCheckStage::perform (int stage, CSMDoc::Messages& messages)
         messages.add(id, "Description is missing", "", CSMDoc::Message::Severity_Warning);
 
     for (int i=0; i<4; ++i)
-    {
         if (skill.mData.mUseValue[i]<0)
         {
             messages.add(id, "Usage experience value #" + std::to_string(i) + " is negative", "", CSMDoc::Message::Severity_Error);
         }
-    }
 }
diff --git a/apps/opencs/model/tools/soundcheck.cpp b/apps/opencs/model/tools/soundcheck.cpp
index 7bb27e9847..09e5ecdbfd 100644
--- a/apps/opencs/model/tools/soundcheck.cpp
+++ b/apps/opencs/model/tools/soundcheck.cpp
@@ -4,7 +4,6 @@
 
 #include "../prefs/state.hpp"
 
-#include "../world/resources.hpp"
 #include "../world/universalid.hpp"
 
 CSMTools::SoundCheckStage::SoundCheckStage (const CSMWorld::IdCollection<ESM::Sound> &sounds,
diff --git a/apps/opencs/model/tools/soundcheck.hpp b/apps/opencs/model/tools/soundcheck.hpp
index 47c3249ce7..fc59257178 100644
--- a/apps/opencs/model/tools/soundcheck.hpp
+++ b/apps/opencs/model/tools/soundcheck.hpp
@@ -3,15 +3,11 @@
 
 #include <components/esm/loadsoun.hpp>
 
+#include "../world/resources.hpp"
 #include "../world/idcollection.hpp"
 
 #include "../doc/stage.hpp"
 
-namespace CSMWorld
-{
-    class Resources;
-}
-
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that sound records are internally consistent